diff --git a/scripts/cirrus/build_freebsd.sh b/scripts/cirrus/build_freebsd.sh index 97554dcf..02fc7b80 100755 --- a/scripts/cirrus/build_freebsd.sh +++ b/scripts/cirrus/build_freebsd.sh @@ -14,9 +14,9 @@ build_engine() cd "$CIRRUS_WORKING_DIR" || die if [ "$APP" = "xashds" ]; then - ./waf configure -T release -d --enable-fs-tests || die + ./waf configure -T release -d --enable-fs-tests || die_configure elif [ "$APP" = "xash3d-fwgs" ]; then - ./waf configure -T release --enable-stb --enable-utils --enable-gl4es --enable-gles1 --enable-gles2 --enable-fs-tests || die + ./waf configure -T release --enable-stb --enable-utils --enable-gl4es --enable-gles1 --enable-gles2 --enable-fs-tests || die_configure else die fi diff --git a/scripts/gha/build_linux.sh b/scripts/gha/build_linux.sh index c9ef119f..b2660b59 100755 --- a/scripts/gha/build_linux.sh +++ b/scripts/gha/build_linux.sh @@ -50,9 +50,9 @@ build_engine() fi if [ "$1" = "dedicated" ]; then - ./waf configure -T release -d $AMD64 --enable-fs-tests || die + ./waf configure -T release -d $AMD64 --enable-fs-tests || die_configure elif [ "$1" = "full" ]; then - ./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils --enable-fs-tests || die + ./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils --enable-fs-tests || die_confgure else die fi diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh index 940a9064..dff2b45a 100755 --- a/scripts/gha/build_win32.sh +++ b/scripts/gha/build_win32.sh @@ -11,8 +11,8 @@ fi # NOTE: to build with other version use --msvc_version during configuration # NOTE: sometimes you may need to add WinSDK to %PATH% -./waf.bat configure -s "SDL2_VC" -T "release" --enable-utils --enable-fs-tests --prefix=`pwd` $AMD64 || die -./waf.bat build -v || die +./waf.bat configure -s "SDL2_VC" -T "release" --enable-utils --enable-fs-tests --prefix=`pwd` $AMD64 || die_configure +./waf.bat build || die ./waf.bat install || die if [ "$ARCH" = "i386" ]; then diff --git a/scripts/lib.sh b/scripts/lib.sh index d62cee6a..bc281338 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -1,9 +1,14 @@ die() { - cat build/config.log exit 1 } +die_configure() +{ + cat build/config.log + die +} + if [ -n "$TRAVIS_BUILD_DIR" ]; then BUILDDIR=$TRAVIS_BUILD_DIR elif [ -n "$GITHUB_WORKSPACE" ]; then