FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

Update mainui. Make VGUI search message more friendly. Update gitignore

This commit is contained in:
Alibek Omarov 2018-06-19 16:17:27 +03:00
parent f23029efe0
commit 76e01f490c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -313,5 +313,6 @@ build-*
*.files
# Waf
build_current
.waf-*
.lock-waf*

2
mainui

@ -1 +1 @@
Subproject commit a61e18458446f54fca061b5040628aae407144c1
Subproject commit 0c354a1d9c6a7443f85ba4c7a8f93141420f281d

13
vgui_support/wscript
View File

@ -19,15 +19,19 @@ def configure(conf):
if conf.options.DEDICATED:
return
conf.start_msg('Checking for VGUI')
if not conf.options.VGUI_DEV:
conf.end_msg('no')
conf.fatal("Provide a path to vgui-dev repository using --vgui key")
if conf.env.DEST_CPU != 'x86' and not (conf.env.DEST_CPU == 'x86_64' and not conf.options.ALLOW64): # multilib case
if conf.env.DEST_CPU != 'x86' and not (conf.env.DEST_CPU == 'x86_64' and not conf.options.ALLOW64):
conf.end_msg('no')
conf.fatal('vgui is not supported on this CPU: ' + conf.env.DEST_CPU)
if conf.env.DEST_OS == 'win32':
conf.env.LIB_VGUI = ['vgui.lib']
conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))]
conf.env.LIB_VGUI = ['vgui.lib']
conf.env.LIBPATH_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'lib/win32_vc6/'))]
else:
if conf.env.DEST_OS == 'linux':
conf.env.LIB_VGUI = [':vgui.so']
@ -39,8 +43,7 @@ def configure(conf):
conf.env.INCLUDES_VGUI = [os.path.abspath(os.path.join(conf.options.VGUI_DEV, 'include'))]
conf.env.HAVE_VGUI = 1
conf.msg('Checking VGUI', '{0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
def get_subproject_name(ctx):
return os.path.basename(os.path.realpath(str(ctx.path)))