Experimental update to gitlab build script (MinGW is no longer suppor…

…ted by JUCE) #2
OpenShot · Dec 7, 2024 · 0c2d383 · 0c2d383
1 parent f2a6c62
commit 0c2d383
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ windows-builder-x64:
     - $env:Path = "C:\msys64\mingw64\bin;C:\msys64\usr\bin;" + $env:Path;
     - $env:MSYSTEM = "MINGW64"
     - New-Item -ItemType Directory -Force -Path build
-    - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=build/install-x64" -G "Unix Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="--target=x86_64-w64-mingw32" -DCMAKE_C_FLAGS="--target=x86_64-w64-mingw32"
+    - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=build/install-x64" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="--target=x86_64-w64-mingw32" -DCMAKE_C_FLAGS="--target=x86_64-w64-mingw32"
     - cmake --build build
     - cmake --install build
     - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value})
@@ -81,7 +81,7 @@ windows-builder-x86:
     - $env:Path = "C:\msys64\mingw32\bin;C:\msys64\usr\bin;" + $env:Path;
     - $env:MSYSTEM = "MINGW32"
     - New-Item -ItemType Directory -Force -Path build
-    - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=build/install-x86" -G "Unix Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="--target=i686-w64-mingw32" -DCMAKE_C_FLAGS="--target=i686-w64-mingw32"
+    - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"CMAKE_INSTALL_PREFIX:PATH=build/install-x86" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="--target=i686-w64-mingw32" -DCMAKE_C_FLAGS="--target=i686-w64-mingw32"
     - cmake --build build
     - cmake --install build
     - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value})