From c0db39594b849cb039143fde1bd88ff98e148a99 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 5 Mar 2021 16:03:26 +0300 Subject: [PATCH] scripts: enable building utils for PC platforms --- scripts/build_freebsd_engine.sh | 2 +- scripts/build_linux_engine.sh | 2 +- scripts/build_mingw_engine.sh | 2 +- scripts/build_osx_engine.sh | 2 +- scripts/build_windows_engine.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build_freebsd_engine.sh b/scripts/build_freebsd_engine.sh index 215de2e2..6fdcec8e 100755 --- a/scripts/build_freebsd_engine.sh +++ b/scripts/build_freebsd_engine.sh @@ -14,7 +14,7 @@ build_engine() if [ "$APP" = "xashds" ]; then ./waf configure -T release -d -W || die elif [ "$APP" = "xash3d-fwgs" ]; then - ./waf configure -T release --enable-stb -W || die + ./waf configure -T release --enable-stb -W --enable-utils || die else die fi diff --git a/scripts/build_linux_engine.sh b/scripts/build_linux_engine.sh index a5fca691..fcb63485 100755 --- a/scripts/build_linux_engine.sh +++ b/scripts/build_linux_engine.sh @@ -52,7 +52,7 @@ build_engine() ./waf configure -T release -d -W $AMD64 || die elif [ "$APP" = "xash3d-fwgs" ]; then APPDIR=$APPNAME.AppDir - ./waf configure --sdl2=SDL2_linux -T release --enable-stb --prefix="$APPDIR" -W $AMD64 || die + ./waf configure --sdl2=SDL2_linux -T release --enable-stb --prefix="$APPDIR" -W $AMD64 --enable-utils || die else die fi diff --git a/scripts/build_mingw_engine.sh b/scripts/build_mingw_engine.sh index def946cb..7eea0e71 100755 --- a/scripts/build_mingw_engine.sh +++ b/scripts/build_mingw_engine.sh @@ -11,7 +11,7 @@ export CXXFLAGS="-static-libgcc -static-libstdc++ -no-pthread -msse2" export LDFLAGS="-static-libgcc -static-libstdc++ -no-pthread -Wl,--allow-multiple-definition" # workaround some other mingw bugs export WINRC="i686-w64-mingw32-windres" rm -rf build # clean build directory -./waf configure -s "SDL2_mingw/i686-w64-mingw32/" --build-type=none --prefix="." --win-style-install -v || die # can't compile VGUI support on MinGW, due to differnet C++ ABI +./waf configure -s "SDL2_mingw/i686-w64-mingw32/" --build-type=none --prefix="." --win-style-install -v --enable-utils || die # can't compile VGUI support on MinGW, due to differnet C++ ABI ./waf build -v || die cp $TRAVIS_BUILD_DIR/SDL2_mingw/i686-w64-mingw32//bin/SDL2.dll . # Install SDL2 cp vgui_support_bin/vgui_support.dll . diff --git a/scripts/build_osx_engine.sh b/scripts/build_osx_engine.sh index c3d6a0da..e5626608 100755 --- a/scripts/build_osx_engine.sh +++ b/scripts/build_osx_engine.sh @@ -5,7 +5,7 @@ # Build engine cd $TRAVIS_BUILD_DIR -python waf configure -s "$HOME/Library/Frameworks/SDL2.framework/" -T debug --prefix="pkg/" --win-style-install || die +python waf configure -s "$HOME/Library/Frameworks/SDL2.framework/" -T debug --prefix="pkg/" --win-style-install --enable-utils || die python waf build || die python waf install || die cp ~/Library/Frameworks/SDL2.framework/SDL2 pkg/libSDL2.dylib diff --git a/scripts/build_windows_engine.sh b/scripts/build_windows_engine.sh index ef01369b..6b473745 100644 --- a/scripts/build_windows_engine.sh +++ b/scripts/build_windows_engine.sh @@ -7,7 +7,7 @@ cd $TRAVIS_BUILD_DIR # 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 "$TRAVIS_BUILD_DIR/SDL2_VC" -T "debug" --prefix=`pwd` || die +./waf.bat configure -s "$TRAVIS_BUILD_DIR/SDL2_VC" -T "debug" --prefix=`pwd` --enable-utils || die ./waf.bat build -v || die echo After build