From fc665527aeaf428d87a5738457d7a4e6ffdcf83a Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 27 Nov 2021 05:57:01 +0300 Subject: [PATCH] wscript: try to fix install on windows --- scripts/gha/build_win32.sh | 4 ++-- wscript | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh index 051a65a9..b99da3ea 100755 --- a/scripts/gha/build_win32.sh +++ b/scripts/gha/build_win32.sh @@ -11,9 +11,9 @@ 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 "debug" --enable-utils $AMD64 || die +./waf.bat configure -s "SDL2_VC" -T "debug" --enable-utils --prefix=`pwd` $AMD64 || die ./waf.bat build -v || die -./waf.bat install --prefix=`pwd` || die +./waf.bat install || die if [ "$ARCH" = "i386" ]; then cp SDL2_VC/lib/x86/SDL2.dll . # Install SDL2 diff --git a/wscript b/wscript index 390b512d..7836ebf5 100644 --- a/wscript +++ b/wscript @@ -295,8 +295,10 @@ def configure(conf): conf.env.LIBDIR = conf.env.BINDIR = '${PREFIX}/lib/xash3d' conf.env.SHAREDIR = '${PREFIX}/share/xash3d' else: - conf.env.PREFIX = '/' - conf.env.SHAREDIR = conf.env.LIBDIR = conf.env.BINDIR = '/' + if sys.platform != 'win32': + conf.env.PREFIX = '/' + + conf.env.SHAREDIR = conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX conf.define('XASH_BUILD_COMMIT', conf.env.GIT_VERSION if conf.env.GIT_VERSION else 'notset') conf.define('XASH_LOW_MEMORY', conf.options.LOW_MEMORY)