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

Update build.sh with 64bit support and with wx2.8 forced for archlinux 

wx3.0 32bit is not in main repositories, better to avoid the use of aur just for pcsx2
This commit is contained in:
antoine faravelon 2014-12-29 13:25:07 +01:00 committed by Gregory Hainaut
parent a11286bbc5
commit cdd6598e65
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.sh
View File

@ -16,14 +16,11 @@
#set -e # This terminates the script in case of any error #set -e # This terminates the script in case of any error
if [[ (-f /usr/bin/wx-config32-2.8 && -f /usr/bin/wxrc32-2.8) ]]; then
#add flags for archlinux
flags=(-DCMAKE_BUILD_PO=FALSE -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8')
else
flags=(-DCMAKE_BUILD_PO=FALSE) flags=(-DCMAKE_BUILD_PO=FALSE)
fi
cleanBuild=0 cleanBuild=0
useClang=0 useClang=0
Build64=0
for ARG in "$@"; do for ARG in "$@"; do
case "$ARG" in case "$ARG" in
@ -73,6 +70,10 @@ for ARG in "$@"; do
esac esac
done done
if [[ (-f /usr/bin/wx-config32-2.8 && -f /usr/bin/wxrc32-2.8) && "$Build64" -eq 0 ]]; then
#add flags for archlinux, wx 3 is not yet in main repositories, wx2.8 need to be used for now
flags+=(-DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DWX28_API=TRUE)
fi
root=$PWD/$(dirname "$0") root=$PWD/$(dirname "$0")
log=$root/install_log.txt log=$root/install_log.txt
build=$root/build build=$root/build