build - fix mingw path

shdwmtr · Jun 25, 2024 · 984232d · 984232d
1 parent 3a5beb5
commit 984232d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/build-win-mingw.yml b/.github/workflows/build-win-mingw.yml
@@ -104,10 +104,17 @@ jobs:
         name: python 3.11.8 build libraries
         path: D:/a/Millennium/Millennium/build/python
 
-    - name: Set up MinGW
-      uses: egor-tensin/setup-mingw@v2
+    - name: Install MinGW
+      uses: msys2/setup-msys2@v2
       with:
-        platform: x86
+        update: true
+        install: >
+            mingw-w64-i686-toolchain
+            mingw-w64-i686-cmake
+            mingw-w64-i686-gcc
+            
+    - name: Add MinGW32 to PATH
+      run: echo "::add-path::C:\msys64\mingw32\bin"
 
     - name: (Dependency) Install vcpkg
       shell: pwsh
@@ -119,7 +126,7 @@ jobs:
 
     - name: (Generator) Configure CMake
       run: |
-        cmake --preset=windows-mingw-release -DGITHUB_ACTION_BUILD=ON
+        cmake --preset=windows-mingw-release -DGITHUB_ACTION_BUILD=ON -DCMAKE_CXX_COMPILER=C:/msys64/mingw32/bin/i686-w64-mingw32-g++.exe
 
     - name: Build Millennium
       run: |

diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json
@@ -36,7 +36,8 @@
         "VCPKG_TARGET_TRIPLET": "x86-mingw-static",
         "CMAKE_CXX_STANDARD": "17",
         "CMAKE_C_STANDARD": "23",
-        "CMAKE_CXX_FLAGS": "-static-libstdc++ -static-libgcc -static -lpthread"
+        "CMAKE_CXX_FLAGS": "-static-libstdc++ -static-libgcc -static -lpthread",
+        "CMAKE_CXX_COMPILER": "C:/msys64/mingw32/bin/i686-w64-mingw32-g++.exe"
       }
     },
     {