RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update mainui. Add possibility to install engine ignoring *nix file hierarchy in wscript. Fix debugging.

Browse Source
This commit is contained in:
Alibek Omarov
2018-05-29 01:02:32 +03:00
parent 236c16e35f
commit 0db8d95bc9
5 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/wscript
View File

@@ -68,7 +68,8 @@ def build(bld):
target = 'xash',
features = 'c cprogram',
includes = includes,
use = libs
use = libs,
install_path = bld.env.BINDIR
)
else:
bld.shlib(
@@ -76,5 +77,6 @@ def build(bld):
target = 'xash',
features = 'c',
includes = includes,
use = libs
use = libs,
install_path = bld.env.LIBDIR
)

3
game_launch/wscript
View File

@@ -54,5 +54,6 @@ def build(bld):
target = 'xash3d', # hl.exe
features = 'c cprogram',
includes = includes,
use = libs
use = libs,
install_path = bld.env.BINDIR
)

2
mainui

Submodule mainui updated: a1c3ad2531...b82d68cc40

3
vgui_support/wscript
View File

@@ -67,4 +67,5 @@ def build(bld):
target = 'vgui_support',
features = 'cxx',
includes = includes,
use = libs)
use = libs,
install_path = bld.env.LIBDIR)

16
wscript
View File

@@ -41,6 +41,10 @@ def options(opt):
opt.add_option(
'--release', action = 'store_true', dest = 'RELEASE', default=False,
help = 'strip debug info from binary and enable optimizations')
opt.add_option(
'--win-style-install', action = 'store_true', dest = 'WIN_INSTALL', default = False,
help = 'install like Windows build, ignore prefix, useful for development')
opt.recurse(SUBDIRS)
@@ -69,9 +73,12 @@ def configure(conf):
if(conf.options.RELEASE):
conf.env.append_unique('CFLAGS', '-O2')
conf.env.append_unique('CXXFLAGS', '-O2')
else:
conf.env.append_unique('CFLAGS', '-Og')
conf.env.append_unique('CFLAGS', '-g')
conf.env.append_unique('CXXFLAGS', '-Og')
conf.env.append_unique('CXXFLAGS', '-g')
conf.check( lib='dl' )
conf.check( lib='m' )
@@ -80,6 +87,15 @@ def configure(conf):
conf.env.DEDICATED = conf.options.DEDICATED
conf.env.SINGLE_BINARY = conf.options.DEDICATED
# indicate if we are packaging for Linux/BSD
if(not conf.options.WIN_INSTALL and
conf.env.DEST_OS != 'win32' and
conf.env.DEST_OS != 'darwin'):
conf.env.LIBDIR = conf.env.BINDIR = '${PREFIX}/lib/xash3d'
else:
# prefix is ignored
conf.env.LIBDIR = conf.env.BINDIR = '/'
# global
conf.env.append_unique('XASH_BUILD_COMMIT', GIT_SHA)