Hide and simplify MinGW toolchain

ThePhD · Feb 27, 2024 · 3884550 · 3884550
1 parent ed549bc
commit 3884550
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
         run: sudo apt update && sudo apt install -y cmake ninja-build g++-mingw-w64-${{matrix.arch.pkg}}
 
       - name: Generate CMake
-        run: mkdir infoware/build && cd infoware/build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../tools/${{matrix.arch.paths}}-w64-mingw32.cmake -G Ninja ..
+        run: mkdir infoware/build && cd infoware/build && cmake -DCMAKE_BUILD_TYPE=Release -DMINGW_ARCH=${{matrix.arch.paths}} -DCMAKE_TOOLCHAIN_FILE=../.github/workflows/mingw.cmake -G Ninja ..
 
       - name: Build Project
         run: cmake --build infoware/build

diff --git a/.github/workflows/mingw.cmake b/.github/workflows/mingw.cmake
@@ -0,0 +1,13 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR ${MINGW_ARCH})
+set(MINGW_TOOLCHAIN ${MINGW_ARCH}-w64-mingw32)
+
+set(CMAKE_FIND_ROOT_PATH /usr/${MINGW_TOOLCHAIN})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CMAKE_C_COMPILER ${MINGW_TOOLCHAIN}-gcc)
+set(CMAKE_CXX_COMPILER ${MINGW_TOOLCHAIN}-g++)
+set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN}-windres)
+set(CMAKE_MC_COMPILER ${MINGW_TOOLCHAIN}-windmc)
diff --git a/tools/i686-w64-mingw32.cmake b/tools/i686-w64-mingw32.cmake
diff --git a/tools/x86_64-w64-mingw32.cmake b/tools/x86_64-w64-mingw32.cmake