From a85bd0c8645467ba6301f08e4a98524667667f4c Mon Sep 17 00:00:00 2001 From: Denis Drakhnia Date: Tue, 1 Apr 2025 07:23:44 +0300 Subject: [PATCH] maintui: first blood --- .gitmodules | 3 +++ 3rdparty/maintui | 1 + wscript | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 160000 3rdparty/maintui diff --git a/.gitmodules b/.gitmodules index 2cb20a75..34b3fa18 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "3rdparty/libbacktrace/libbacktrace"] path = 3rdparty/libbacktrace/libbacktrace url = https://github.com/ianlancetaylor/libbacktrace +[submodule "3rdparty/maintui"] + path = 3rdparty/maintui + url = https://github.com/numas13/xash3d-maintui.git diff --git a/3rdparty/maintui b/3rdparty/maintui new file mode 160000 index 00000000..074876cc --- /dev/null +++ b/3rdparty/maintui @@ -0,0 +1 @@ +Subproject commit 074876cccea55d377c1fdbc6793b11a02bd85fad diff --git a/wscript b/wscript index 4d74827d..0c018f99 100644 --- a/wscript +++ b/wscript @@ -99,7 +99,8 @@ SUBDIRS = [ Subproject('3rdparty/libogg', lambda x: x.env.CLIENT and not x.env.HAVE_SYSTEM_OGG), Subproject('3rdparty/vorbis', lambda x: x.env.CLIENT and (not x.env.HAVE_SYSTEM_VORBIS or not x.env.HAVE_SYSTEM_VORBISFILE)), Subproject('3rdparty/opusfile', lambda x: x.env.CLIENT and not x.env.HAVE_SYSTEM_OPUSFILE), - Subproject('3rdparty/mainui', lambda x: x.env.CLIENT), + Subproject('3rdparty/mainui', lambda x: x.env.CLIENT and not x.env.TUI), + Subproject('3rdparty/maintui', lambda x: x.env.CLIENT and x.env.TUI), Subproject('3rdparty/vgui_support', lambda x: x.env.CLIENT), Subproject('3rdparty/MultiEmulator',lambda x: x.env.CLIENT), # Subproject('3rdparty/freevgui', lambda x: x.env.CLIENT), @@ -137,6 +138,9 @@ def options(opt): grp.add_option('--enable-dedicated', action = 'store_true', dest = 'ENABLE_DEDICATED', default = False, help = 'enable building Xash Dedicated Server alongside client [default: %(default)s]') + grp.add_option('--enable-tui', action = 'store_true', dest = 'ENABLE_TUI', default = False, + help = 'enable TUI main menu [default: %(default)s]') + grp.add_option('--gamedir', action = 'store', dest = 'GAMEDIR', default = 'valve', help = 'engine default (base) game directory [default: %(default)s]') @@ -415,6 +419,8 @@ def configure(conf): conf.env.CLIENT = False conf.env.LAUNCHER = False + conf.env.TUI = conf.options.ENABLE_TUI + conf.define_cond('SUPPORT_HL25_EXTENDED_STRUCTS', conf.options.SUPPORT_HL25_EXTENDED_STRUCTS) if conf.env.SAILFISH == 'aurora':