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

Default to a native build. Remove --clean-plugins. (#5132)

This commit is contained in:
arcum42 2021-12-27 20:31:27 -08:00 committed by GitHub
parent 61a196bc3d
commit af067a8c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.sh
View File

@ -164,8 +164,8 @@ cleanBuild=0
useClang=0 useClang=0
useIcc=0 useIcc=0
# 0 => no, 1 => yes, 2 => force yes # 0 => no, 1 => yes
useCross=2 useCross=0
CoverityBuild=0 CoverityBuild=0
cppcheck=0 cppcheck=0
@ -183,7 +183,6 @@ set_make
for ARG in "$@"; do for ARG in "$@"; do
case "$ARG" in case "$ARG" in
--clean ) cleanBuild=1 ;; --clean ) cleanBuild=1 ;;
--clean-plugins ) cleanBuild=2 ;;
--clang-tidy ) flags="$flags -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"; clangTidy=1 ; useClang=1;; --clang-tidy ) flags="$flags -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"; clangTidy=1 ; useClang=1;;
--ftime-trace ) flags="$flags -DTIMETRACE=TRUE"; useClang=1;; --ftime-trace ) flags="$flags -DTIMETRACE=TRUE"; useClang=1;;
--clang ) useClang=1 ;; --clang ) useClang=1 ;;
@ -220,11 +219,11 @@ for ARG in "$@"; do
echo "--release : Build PCSX2 as a Release build." echo "--release : Build PCSX2 as a Release build."
echo echo
echo "--clean : Do a clean build." echo "--clean : Do a clean build."
echo "--clean-plugins : Do a clean build of plugins, but not of pcsx2."
echo "--no-simd : Only allow sse2" echo "--no-simd : Only allow sse2"
echo echo
echo "** Developer option **" echo "** Developer option **"
echo "--cross-multilib: Build a 32bit PCSX2 on a 64bit machine using multilib." echo "--cross-multilib: Build a 32bit PCSX2 on a 64bit machine using multilib."
echo "--no-cross-multilib: Build a native version of PCSX2 (default)"
echo echo
echo "** Distribution Compatibilities **" echo "** Distribution Compatibilities **"
echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)" echo "--sdl12 : Build with SDL1.2 (requires if wx is linked against SDL1.2)"
@ -233,7 +232,6 @@ for ARG in "$@"; do
echo echo
echo "** Expert Developer option **" echo "** Expert Developer option **"
echo "--gtk2 : use GTK 2 instead of GTK 3" echo "--gtk2 : use GTK 2 instead of GTK 3"
echo "--no-cross-multilib: Build a native PCSX2 (nonfunctional recompiler)"
echo "--no-trans : Don't regenerate mo files when building." echo "--no-trans : Don't regenerate mo files when building."
echo "--clang : Build with Clang/llvm" echo "--clang : Build with Clang/llvm"
echo "--intel : Build with ICC (Intel compiler)" echo "--intel : Build with ICC (Intel compiler)"
@ -257,16 +255,14 @@ if [ "$cleanBuild" -eq 1 ]; then
echo "Doing a clean build." echo "Doing a clean build."
# allow to keep build as a symlink (for example to a ramdisk) # allow to keep build as a symlink (for example to a ramdisk)
rm -fr "$build"/* rm -fr "$build"/*
elif [ "$cleanBuild" -eq 2 ]; then
echo "Doing a clean build on the plugins, but not pcsx2."
rm -fr "$build"/plugins/*
fi fi
if [ "$useCross" -eq 2 ] && [ "$(getconf LONG_BIT 2> /dev/null)" != 32 ]; then if [ "$useCross" -eq 1 ]; then
echo "Forcing cross compilation." echo "Cross compiling."
flags="$flags $i386_flag" flags="$flags $i386_flag"
elif [ "$useCross" -ne 1 ]; then elif [ "$useCross" -ne 1 ]; then
useCross=0 useCross=0
echo "Compiling natively."
fi fi
switch_wxconfig switch_wxconfig