Fix CI workflow

nba-emu · Apr 1, 2024 · 2804045 · 2804045
1 parent b473a4c
commit 2804045
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -81,12 +81,8 @@ jobs:
             -DCMAKE_CXX_FLAGS="-s" \
             -DUSE_STATIC_SDL=ON \
             -DCMAKE_BUILD_TYPE=Release \
-<<<<<<< HEAD
             -DRELEASE_BUILD=ON \
-            -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix glew)" \
-=======
             -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" \
->>>>>>> f53171877606cd6916c5b13c022b06bde3e93aa5
             -DMACOS_BUILD_APP_BUNDLE=ON \
             -DMACOS_BUNDLE_QT=ON
           cd build
@@ -129,6 +125,7 @@ jobs:
             -DCMAKE_CXX_FLAGS="-s" \
             -DUSE_STATIC_SDL=ON \
             -DCMAKE_BUILD_TYPE=Release \
+            -DRELEASE_BUILD=ON \
             -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5)" \
             -DMACOS_BUILD_APP_BUNDLE=ON \
             -DMACOS_BUNDLE_QT=ON