diff --git a/CMakeLists.txt b/CMakeLists.txt index 35e25f1c..9bdf7851 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,10 +53,14 @@ option(MemoryOnly "MemoryOnly" OFF) option(NoThreading "NoThreading" OFF) option(ExceptionsDisabled "ExceptionsDisabled" OFF) -if (32bit AND NOT MSVC AND NOT IS_ARM) +if (32bit AND NOT IS_ARM) message("-- 32 bit compilation") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") + if (NOT MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") + else() + set(CMAKE_VS_PLATFORM_NAME "Win32") + endif() endif() if (NOT MSVC AND NOT APPLE) diff --git a/ci/setup-environment.ps1 b/ci/setup-environment.ps1 index b1b7031a..5e90b3bd 100644 --- a/ci/setup-environment.ps1 +++ b/ci/setup-environment.ps1 @@ -12,3 +12,10 @@ if ($BuildMethod -eq "msbuild") { ./environments/setup-msbuild.ps1 } + +if ($IsLinux) { + + # Install multilib, as this may be required. + sudo apt-get install -y gcc-multilib + +}