mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-12-23 09:16:04 +01:00
travis: try to fix travis
This commit is contained in:
parent
d9545e5e78
commit
9bb2870e38
12
.travis.yml
12
.travis.yml
@ -18,8 +18,6 @@ jobs:
|
||||
cache: ccache
|
||||
os: linux
|
||||
dist: xenial
|
||||
env:
|
||||
- ARCH=i686
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
@ -36,17 +34,15 @@ jobs:
|
||||
- sh scripts/travis_common_deps.sh
|
||||
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
|
||||
script:
|
||||
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
|
||||
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh i686
|
||||
after_script:
|
||||
- ccache --show-stats
|
||||
- sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage
|
||||
- # ...
|
||||
name: "Build for Linux amd64"
|
||||
- # ...
|
||||
name: "Build for Linux amd64"
|
||||
cache: ccache
|
||||
os: linux
|
||||
dist: xenial
|
||||
env:
|
||||
- ARCH=amd64
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
@ -61,7 +57,7 @@ jobs:
|
||||
- sh scripts/travis_common_deps.sh
|
||||
- sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
|
||||
script:
|
||||
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
|
||||
- sh scripts/build_${TRAVIS_OS_NAME}_engine.sh amd64
|
||||
after_script:
|
||||
- ccache --show-stats
|
||||
- sh scripts/continious_upload.sh Xash3DFWGS-${ARCH}.AppImage
|
||||
|
@ -2,9 +2,7 @@
|
||||
|
||||
. scripts/lib.sh
|
||||
|
||||
if [ ! $ARCH ]; then
|
||||
ARCH=i686
|
||||
fi
|
||||
ARCH=$1
|
||||
|
||||
# set up ccache
|
||||
export CC="ccache gcc"
|
||||
@ -17,7 +15,7 @@ APPDIR=$APP-$ARCH.AppDir
|
||||
build_sdl2()
|
||||
{
|
||||
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"
|
||||
fi
|
||||
./configure --disable-render --disable-haptic --disable-power --disable-filesystem \
|
||||
@ -38,7 +36,7 @@ build_engine()
|
||||
cd $TRAVIS_BUILD_DIR
|
||||
|
||||
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"
|
||||
fi
|
||||
./waf configure $WAF_CONFIGURE_FLAGS || die
|
||||
@ -55,7 +53,7 @@ build_appimage()
|
||||
python3 scripts/makepak.py xash-extras/ $APPDIR/extras.pak
|
||||
|
||||
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/
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user