Use MSVC on CI

Author: FredyH

.github/workflows/build.yml

@@ -72,6 +72,12 @@ jobs:
         restore-keys: |
           vcpkg-${{ matrix.os }}-${{ matrix.arch }}-
 
+    - name: Setup MSVC (Windows)
+      if: matrix.os == 'windows'
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+
     - name: Setup vcpkg cache (Windows)
       if: matrix.os == 'windows'
       uses: actions/cache@v4

CMakeLists.txt

@@ -1,4 +1,12 @@
 cmake_minimum_required(VERSION 3.10)
+
+if(VCPKG_TARGET_TRIPLET MATCHES "^x86-")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32" CACHE STRING "" FORCE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32" CACHE STRING "" FORCE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m32" CACHE STRING "" FORCE)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32" CACHE STRING "" FORCE)
+endif()
+
 project(gwsockets)
 add_subdirectory(GmodLUA)
 
@@ -23,10 +31,6 @@ if(WIN32)
     target_compile_definitions(gwsockets PRIVATE WIN32 GMMODULE BOOST_ALL_NO_LIB NDEBUG)
 else()
     target_compile_definitions(gwsockets PRIVATE LINUX GMMODULE BOOST_ALL_NO_LIB NDEBUG)
-    if(VCPKG_TARGET_TRIPLET MATCHES "^x86-")
-        target_compile_options(gwsockets PRIVATE -m32)
-        target_link_options(gwsockets PRIVATE -m32)
-    endif()
 endif()
 
 # Link with OpenSSL and Boost from vcpkg

CMakePresets.json

@@ -17,6 +17,10 @@
       "inherits": "vcpkg-base",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/cmake-build-x86-release",
+      "architecture": {
+        "value": "x86",
+        "strategy": "external"
+      },
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "VCPKG_TARGET_TRIPLET": "x86-windows-static"
@@ -33,6 +37,10 @@
       "inherits": "vcpkg-base",
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/cmake-build-x64-release",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "VCPKG_TARGET_TRIPLET": "x64-windows-static"
@@ -50,7 +58,7 @@
       "binaryDir": "${sourceDir}/cmake-build-x86-release",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "VCPKG_TARGET_TRIPLET": "x86-linux"
+        "VCPKG_TARGET_TRIPLET": "x86-linux-static"
       },
       "condition": {
         "type": "equals",
@@ -65,7 +73,7 @@
       "binaryDir": "${sourceDir}/cmake-build-x64-release",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "VCPKG_TARGET_TRIPLET": "x64-linux"
+        "VCPKG_TARGET_TRIPLET": "x64-linux-static"
       },
       "condition": {
         "type": "equals",