„install-xash3d.sh“ ändern
This commit is contained in:
parent
aca10308e2
commit
cbeaca2ff5
1 changed files with 4 additions and 3 deletions
|
@ -115,13 +115,13 @@ XASH_INSTALL_MODE=$2
|
||||||
|
|
||||||
case $1 in
|
case $1 in
|
||||||
"client")
|
"client")
|
||||||
|
XASH_APT_PACKAGES="git curl build-essential gcc-multilib g++-multilib python python2 libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386"
|
||||||
case $XASH_INSTALL_VERSION in
|
case $XASH_INSTALL_VERSION in
|
||||||
0.19)
|
0.19)
|
||||||
CMAKE_OPTIONS='-DXASH_DOWNLOAD_DEPENDENCIES=yes -DXASH_STATIC=ON-DXASH_DLL_LOADER=ON -DXASH_VGUI=ON -DMAINUI_USE_STB=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32"'
|
CMAKE_OPTIONS='-DXASH_DOWNLOAD_DEPENDENCIES=yes -DXASH_STATIC=ON-DXASH_DLL_LOADER=ON -DXASH_VGUI=ON -DMAINUI_USE_STB=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32"'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
0.20)
|
0.20)
|
||||||
PACKAGES="git curl build-essential gcc-multilib g++-multilib python python2 libsdl2-dev:i386 libfontconfig-dev:i386 libfreetype6-dev:i386"
|
|
||||||
WAF_OPTIONS="--enable-utils --enable-stb"
|
WAF_OPTIONS="--enable-utils --enable-stb"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -129,12 +129,13 @@ case $1 in
|
||||||
|
|
||||||
;;
|
;;
|
||||||
"server")
|
"server")
|
||||||
|
XASH_APT_PACKAGES="build-essential ca-certificates cmake curl git gnupg2 g++-multilib lib32gcc1-s1 libstdc++6:i386 python unzip xz-utils zip"
|
||||||
case $XASH_INSTALL_VERSION in
|
case $XASH_INSTALL_VERSION in
|
||||||
0.19)
|
0.19)
|
||||||
CMAKE_OPTIONS='-DXASH_DEDICATED=ON -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32"'
|
CMAKE_OPTIONS='-DXASH_DEDICATED=ON -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32"'
|
||||||
;;
|
;;
|
||||||
0.20)
|
0.20)
|
||||||
PACKAGES="build-essential ca-certificates cmake curl git gnupg2 g++-multilib lib32gcc1-s1 libstdc++6:i386 python unzip xz-utils zip"
|
|
||||||
WAF_OPTIONS="-d"
|
WAF_OPTIONS="-d"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -166,7 +167,7 @@ then
|
||||||
message info "Performing apt install"
|
message info "Performing apt install"
|
||||||
sudo dpkg --add-architecture i386
|
sudo dpkg --add-architecture i386
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt-get install -y --no-install-recommends $PACKAGES
|
sudo apt-get install -y --no-install-recommends $XASH_APT_PACKAGES
|
||||||
fi
|
fi
|
||||||
|
|
||||||
message info "Prepare ${YELLOW}${XASH_GIT_DIR}${ENDCOLOR}"
|
message info "Prepare ${YELLOW}${XASH_GIT_DIR}${ENDCOLOR}"
|
||||||
|
|
Loading…
Reference in a new issue