fix bug which caused the temporary user folder to not be used during movies with Citra
also slightly adjust the linux build script so other compilers can be easily used, add comment explaining why libc++ is used
This commit is contained in:
parent
a315b122c5
commit
871036c81a
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,10 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
if [ -z "$CC" ]; then export CC="clang"; fi
|
||||
if [ -z "$CXX" ]; then export CXX="clang++"; fi
|
||||
|
||||
# libc++ must be used currently as Citra fails to build with stdlibc++ due to a stdlibc++ bug
|
||||
|
||||
rm -rf build
|
||||
mkdir build
|
||||
export GLSLANG_VALIDATOR_DIR=$(realpath ./glslangValidator)
|
||||
|
@ -7,6 +13,6 @@ cmake ../citra -DENABLE_SDL2=OFF -DUSE_SYSTEM_SDL2=OFF -DENABLE_QT=OFF -DENABLE_
|
|||
-DENABLE_TESTS=OFF -DENABLE_DEDICATED_ROOM=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_CUBEB=OFF -DENABLE_OPENAL=OFF \
|
||||
-DENABLE_LIBUSB=OFF -DUSE_DISCORD_PRESENCE=OFF -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_LIBUSB=OFF \
|
||||
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF -DENABLE_HEADLESS=ON -DCMAKE_PROGRAM_PATH=$GLSLANG_VALIDATOR_DIR \
|
||||
-DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
|
||||
-DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=ON -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Wno-deprecated" -G Ninja
|
||||
ninja
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 663a9bc6b59ea3bda50a1e55007bd46357fcfc85
|
||||
Subproject commit 7797ef039398d60c03773fa1a397f110e378c770
|
Loading…
Reference in New Issue