Quick fix and code cleanup

9 months ago · ebd3605313
1 changed files with 0 additions and 9 deletions
--- a/.ci/linux/build.sh
+++ b/.ci/linux/build.sh
@ -52,18 +52,9 @@ cmake .. -G Ninja \
    -DYUZU_USE_BUNDLED_SDL2=OFF \
    -DYUZU_USE_EXTERNAL_SDL2=ON \
    -DYUZU_TESTS=OFF \
-<<<<<<< HEAD
-    -DYUZU_USE_LLVM_DEMANGLE=OFF \
-    -DYUZU_USE_QT_MULTIMEDIA=OFF \
-    -DYUZU_USE_QT_WEB_ENGINE=OFF \
-    -DENABLE_QT_TRANSLATION=ON \
-    -DUSE_DISCORD_PRESENCE=OFF \
-    -DYUZU_USE_FASTER_LD=OFF \
-=======
    -DYUZU_USE_QT_MULTIMEDIA=ON \
    -DYUZU_USE_QT_WEB_ENGINE=ON \
    -DYUZU_USE_FASTER_LD=ON \
->>>>>>> cmake-qt-fix
    -DYUZU_ENABLE_LTO=ON \
 	"${EXTRA_CMAKE_FLAGS[@]}"