YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-18 02:50:33 +00:00
Code Issues Projects Releases Wiki Activity

travis: try to fix linux builds #2

Browse Source
This commit is contained in:
Alibek Omarov 2019-07-25 04:50:57 +03:00
parent 9bb2870e38
commit 1636d36dc2
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -31,10 +31,11 @@ jobs:
- libstdc++6:i386 - libstdc++6:i386
- libfuse2:i386 - libfuse2:i386
before_script: before_script:
- export ARCH=i686
- 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 i686 - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
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
@ -54,10 +55,11 @@ jobs:
- libstdc++6 - libstdc++6
- libfuse2 - libfuse2
before_script: before_script:
- export ARCH=amd64
- 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 amd64 - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
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

14
scripts/build_linux_engine.sh
View File

@ -2,7 +2,9 @@
. scripts/lib.sh . scripts/lib.sh
ARCH=$1 if [ ! $ARCH ]; then
ARCH=i686
fi
# set up ccache # set up ccache
export CC="ccache gcc" export CC="ccache gcc"
@ -15,8 +17,9 @@ 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
export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2" export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2"
export LDFLAGS="-m32"
fi fi
./configure --disable-render --disable-haptic --disable-power --disable-filesystem \ ./configure --disable-render --disable-haptic --disable-power --disable-filesystem \
--disable-file --disable-libudev --disable-dbus --disable-ibus \ --disable-file --disable-libudev --disable-dbus --disable-ibus \
@ -28,6 +31,7 @@ build_sdl2()
mkdir -p $TRAVIS_BUILD_DIR/SDL2_linux mkdir -p $TRAVIS_BUILD_DIR/SDL2_linux
make install DESTDIR=$TRAVIS_BUILD_DIR/SDL2_linux || die make install DESTDIR=$TRAVIS_BUILD_DIR/SDL2_linux || die
export CFLAGS="" export CFLAGS=""
export LDFLAGS=""
} }
build_engine() build_engine()
@ -35,8 +39,8 @@ build_engine()
# Build engine # 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="--sdl2=$TRAVIS_BUILD_DIR/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
@ -53,7 +57,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