ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: Fix avx2-pch build 

Was broken when `ADDITIONAL_CMAKE_ARGS` got quoted
This commit is contained in:
tellowkrinkle 2021-07-17 17:39:29 -05:00 committed by GitHub
parent 03b0d2eb00
commit e92d15e459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/scripts/linux/generate-cmake.sh vendored
View File

@ -11,8 +11,7 @@ else
fi fi
if [ "${PLATFORM}" = x86 ]; then if [ "${PLATFORM}" = x86 ]; then
ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS" ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake"
TOOLCHAIN="cmake/linux-compiler-i386-multilib.cmake"
fi fi
echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}" echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}"
@ -27,7 +26,7 @@ cmake \
-DCMAKE_INSTALL_DOCDIR="/tmp/PCSX2" \ -DCMAKE_INSTALL_DOCDIR="/tmp/PCSX2" \
-DOpenGL_GL_PREFERENCE="LEGACY" \ -DOpenGL_GL_PREFERENCE="LEGACY" \
-DOPENGL_opengl_LIBRARY="" \ -DOPENGL_opengl_LIBRARY="" \
-DXDG_STD=TRUE "${ADDITIONAL_CMAKE_ARGS}" \ -DXDG_STD=TRUE \
-DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" \ $ADDITIONAL_CMAKE_ARGS \
-GNinja \ -GNinja \
-B build -B build