From fac536f8c4f8e54dd054a9d9d92b20bba8b83697 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 28 May 2018 23:47:38 +0300 Subject: [PATCH] Add mainui_cpp. Use appropriate message in vgui_support's wscript. --- .gitmodules | 3 +++ mainui | 1 + vgui_support/wscript | 2 +- wscript | 3 +-- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 mainui diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..f275c17e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "mainui"] + path = mainui + url = https://github.com/FWGS/mainui_cpp diff --git a/mainui b/mainui new file mode 160000 index 00000000..a1c3ad25 --- /dev/null +++ b/mainui @@ -0,0 +1 @@ +Subproject commit a1c3ad25311549999f67dd2a9bc8f5d153bf9355 diff --git a/vgui_support/wscript b/vgui_support/wscript index e73d0b15..65da5144 100644 --- a/vgui_support/wscript +++ b/vgui_support/wscript @@ -40,7 +40,7 @@ def configure(conf): 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): return os.path.basename(os.path.realpath(str(ctx.path))) diff --git a/wscript b/wscript index 4b05d1af..afe3fc06 100644 --- a/wscript +++ b/wscript @@ -21,7 +21,7 @@ def get_git_version(): VERSION = '0.99' APPNAME = 'xash3d-fwgs' GIT_SHA = get_git_version() -SUBDIRS = [ 'game_launch', 'vgui_support', 'engine' ] +SUBDIRS = [ 'game_launch', 'vgui_support', 'engine', 'mainui' ] top = '.' @@ -72,7 +72,6 @@ def configure(conf): else: conf.env.append_unique('CFLAGS', '-Og') conf.env.append_unique('CFLAGS', '-g') - conf.check( lib='dl' ) conf.check( lib='m' )