travis: enable building and publishing for AMD64. Use at your own risk!

scripts/build_linux_engine.sh

@@ -1,38 +1,100 @@
 #!/bin/bash
 
-# Build custom SDL2
-
 . scripts/lib.sh
 
-cd $TRAVIS_BUILD_DIR/SDL2_src
-export CC="ccache gcc -msse2 -march=i686 -m32 -ggdb -O2"
-./configure \
-	--disable-dependency-tracking \
-	--disable-render \
-	--disable-haptic \
-	--disable-power \
-	--disable-filesystem \
-	--disable-file \
-	--enable-alsa-shared \
-	--enable-pulseaudio-shared \
-	--enable-wayland-shared \
-	--enable-x11-shared \
-	--disable-libudev \
-	--disable-dbus \
-	--disable-ibus \
-	--disable-ime \
-	--disable-fcitx \
-	--prefix / # get rid of /usr/local stuff
-make -j2
-mkdir -p $TRAVIS_BUILD_DIR/SDL2_linux
-make install DESTDIR=$TRAVIS_BUILD_DIR/SDL2_linux
+if [ ! $ARCH ]; then
+	ARCH=i686
+fi
 
-# Build engine
-cd $TRAVIS_BUILD_DIR
+# set up ccache
 export CC="ccache gcc"
 export CXX="ccache g++"
-./waf configure -s SDL2_linux -T debug --enable-stb --prefix="appimage" --win-style-install || die
-./waf build || die
 
-# Build AppImage
-scripts/build_appimage.sh
+# AppImage settings
+APP=Xash3DFWGS
+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
+		export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2"
+	fi
+	./configure --disable-render --disable-haptic --disable-power --disable-filesystem \
+		--disable-file --disable-libudev --disable-dbus --disable-ibus \
+		--disable-ime --disable-fcitx \
+		--enable-alsa-shared --enable-pulseaudio-shared \
+		--enable-wayland-shared --enable-x11-shared \
+		--prefix / || die # get rid of /usr/local stuff
+	make -j2 || die
+	mkdir -p $TRAVIS_BUILD_DIR/SDL2_linux
+	make install DESTDIR=$TRAVIS_BUILD_DIR/SDL2_linux || die
+	export CFLAGS=""
+}
+
+build_engine()
+{
+	# 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
+		WAF_CONFIGURE_FLAGS="$WAF_CONFIGURE_FLAGS -8"
+	fi
+	./waf configure $WAF_CONFIGURE_FLAGS || die
+	./waf build || die
+}
+
+build_appimage()
+{
+	cd $TRAVIS_BUILD_DIR
+
+	./waf install || die
+
+	# Generate extras.pak
+	python3 scripts/makepak.py xash-extras/ $APPDIR/extras.pak
+
+	cp SDL2_linux/lib/libSDL2-2.0.so.0 $APPDIR/
+	if [ $ARCH == "i686" ]; then
+		cp vgui-dev/lib/vgui.so $APPDIR/
+	fi
+
+	cat > $APPDIR/AppRun << 'EOF'
+#!/bin/sh
+
+if [ "$XASH3D_BASEDIR" = "" ]; then
+	export XASH3D_BASEDIR=$PWD
+fi
+echo "Xash3D FWGS installed as AppImage."
+echo "Base directory is $XASH3D_BASEDIR. Set XASH3D_BASEDIR environment variable to override this"
+
+export XASH3D_EXTRAS_PAK1="${APPDIR}"/extras.pak
+export LD_LIBRARY_PATH="${APPDIR}":$LD_LIBRARY_PATH
+${DEBUGGER} "${APPDIR}"/xash3d "$@"
+exit $?
+EOF
+
+	chmod +x $APPDIR/xash3d $APPDIR/AppRun # Engine launcher & engine launcher script
+
+	echo "Contents of AppImage: "
+	ls -R $APPDIR
+
+	wget "https://raw.githubusercontent.com/FWGS/fwgs-artwork/master/xash3d/icon_512.png" -O $APPDIR/$APP.png
+
+	cat > $APPDIR/$APP.desktop <<EOF
+[Desktop Entry]
+Name=$APP
+Icon=$APP
+Type=Application
+Exec=AppRun
+Categories=Game;
+EOF
+
+	wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$ARCH.AppImage"
+	chmod +x appimagetool-$ARCH.AppImage
+	./appimagetool-$ARCH.AppImage $APPDIR
+}
+
+build_sdl2
+build_engine
+build_appimage