Half-Life-RTX/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/w23/xash3d-fwgs synced 2024-12-15 13:41:33 +01:00
Code Issues Projects Releases Wiki Activity

travis: try to fix travis

Browse Source
This commit is contained in:
Alibek Omarov 2019-07-21 12:23:53 +03:00
parent d9545e5e78
commit 9bb2870e38
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -18,8 +18,6 @@ jobs:
cache: ccache cache: ccache
os: linux os: linux
dist: xenial dist: xenial
env:
- ARCH=i686
addons: addons:
apt: apt:
packages: packages:
@ -36,7 +34,7 @@ jobs:
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
script: script:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh i686
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage - sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage
@ -45,8 +43,6 @@ jobs:
cache: ccache cache: ccache
os: linux os: linux
dist: xenial dist: xenial
env:
- ARCH=amd64
addons: addons:
apt: apt:
packages: packages:
@ -61,7 +57,7 @@ jobs:
- sh scripts/travis_common_deps.sh - sh scripts/travis_common_deps.sh
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
script: script:
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh amd64
after_script: after_script:
- ccache --show-stats - ccache --show-stats
- sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage - sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage

10
scripts/build_linux_engine.sh
View File

@ -2,9 +2,7 @@
. scripts/lib.sh . scripts/lib.sh
if [ ! $ARCH ]; then ARCH=$1
ARCH=i686
fi
# set up ccache # set up ccache
export CC="ccache gcc" export CC="ccache gcc"
@ -17,7 +15,7 @@ APPDIR=$APP-$ARCH.AppDir
build_sdl2() build_sdl2()
{ {
cd $TRAVIS_BUILD_DIR/SDL2_src cd $TRAVIS_BUILD_DIR/SDL2_src
if [ $ARCH == "i686" ]; then # yes, it isn't good to pass flags as CC, but I don't want to clear CFLAGS after building SDL2 if [ "$ARCH" == "i686" ]; then # yes, it isn't good to pass flags as CC, but I don't want to clear CFLAGS after building SDL2
export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2" export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2"
fi fi
./configure --disable-render --disable-haptic --disable-power --disable-filesystem \ ./configure --disable-render --disable-haptic --disable-power --disable-filesystem \
@ -38,7 +36,7 @@ build_engine()
cd $TRAVIS_BUILD_DIR cd $TRAVIS_BUILD_DIR
WAF_CONFIGURE_FLAGS="-s SDL2_linux -T release --enable-stb --prefix=$APPDIR --win-style-install" WAF_CONFIGURE_FLAGS="-s SDL2_linux -T release --enable-stb --prefix=$APPDIR --win-style-install"
if [ $ARCH == "amd64" ]; then # we need enabling 64-bit target only on Intel-compatible CPUs if [ "$ARCH" == "amd64" ]; then # we need enabling 64-bit target only on Intel-compatible CPUs
WAF_CONFIGURE_FLAGS="$WAF_CONFIGURE_FLAGS -8" WAF_CONFIGURE_FLAGS="$WAF_CONFIGURE_FLAGS -8"
fi fi
./waf configure $WAF_CONFIGURE_FLAGS || die ./waf configure $WAF_CONFIGURE_FLAGS || die
@ -55,7 +53,7 @@ build_appimage()
python3 scripts/makepak.py xash-extras/ $APPDIR/extras.pak python3 scripts/makepak.py xash-extras/ $APPDIR/extras.pak
cp SDL2_linux/lib/libSDL2-2.0.so.0 $APPDIR/ cp SDL2_linux/lib/libSDL2-2.0.so.0 $APPDIR/
if [ $ARCH == "i686" ]; then if [ "$ARCH" == "i686" ]; then
cp vgui-dev/lib/vgui.so $APPDIR/ cp vgui-dev/lib/vgui.so $APPDIR/
fi fi