Browse Source

Add mainui_cpp. Use appropriate message in vgui_support's wscript.

pull/2/head
Alibek Omarov 7 years ago
parent
commit
fac536f8c4
  1. 3
      .gitmodules
  2. 1
      mainui
  3. 2
      vgui_support/wscript
  4. 3
      wscript

3
.gitmodules vendored

@ -0,0 +1,3 @@
[submodule "mainui"]
path = mainui
url = https://github.com/FWGS/mainui_cpp

1
mainui

@ -0,0 +1 @@
Subproject commit a1c3ad25311549999f67dd2a9bc8f5d153bf9355

2
vgui_support/wscript

@ -40,7 +40,7 @@ def configure(conf):
conf.env.HAVE_VGUI = 1 conf.env.HAVE_VGUI = 1
Logs.info('VGUI configured as {0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI)) conf.msg('Checking VGUI', '{0}, {1}, {2}'.format(conf.env.LIB_VGUI, conf.env.LIBPATH_VGUI, conf.env.INCLUDES_VGUI))
def get_subproject_name(ctx): def get_subproject_name(ctx):
return os.path.basename(os.path.realpath(str(ctx.path))) return os.path.basename(os.path.realpath(str(ctx.path)))

3
wscript

@ -21,7 +21,7 @@ def get_git_version():
VERSION = '0.99' VERSION = '0.99'
APPNAME = 'xash3d-fwgs' APPNAME = 'xash3d-fwgs'
GIT_SHA = get_git_version() GIT_SHA = get_git_version()
SUBDIRS = [ 'game_launch', 'vgui_support', 'engine' ] SUBDIRS = [ 'game_launch', 'vgui_support', 'engine', 'mainui' ]
top = '.' top = '.'
@ -73,7 +73,6 @@ def configure(conf):
conf.env.append_unique('CFLAGS', '-Og') conf.env.append_unique('CFLAGS', '-Og')
conf.env.append_unique('CFLAGS', '-g') conf.env.append_unique('CFLAGS', '-g')
conf.check( lib='dl' ) conf.check( lib='dl' )
conf.check( lib='m' ) conf.check( lib='m' )
conf.check( lib='pthread' ) conf.check( lib='pthread' )

Loading…
Cancel
Save