Skip to content

Commit a85bd0c

Browse files
numas13a1batross
authored andcommitted
maintui: first blood
1 parent 0a5f175 commit a85bd0c

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@
3737
[submodule "3rdparty/libbacktrace/libbacktrace"]
3838
path = 3rdparty/libbacktrace/libbacktrace
3939
url = https://github.com/ianlancetaylor/libbacktrace
40+
[submodule "3rdparty/maintui"]
41+
path = 3rdparty/maintui
42+
url = https://github.com/numas13/xash3d-maintui.git

3rdparty/maintui

Submodule maintui added at 074876c

wscript

+7-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ SUBDIRS = [
9999
Subproject('3rdparty/libogg', lambda x: x.env.CLIENT and not x.env.HAVE_SYSTEM_OGG),
100100
Subproject('3rdparty/vorbis', lambda x: x.env.CLIENT and (not x.env.HAVE_SYSTEM_VORBIS or not x.env.HAVE_SYSTEM_VORBISFILE)),
101101
Subproject('3rdparty/opusfile', lambda x: x.env.CLIENT and not x.env.HAVE_SYSTEM_OPUSFILE),
102-
Subproject('3rdparty/mainui', lambda x: x.env.CLIENT),
102+
Subproject('3rdparty/mainui', lambda x: x.env.CLIENT and not x.env.TUI),
103+
Subproject('3rdparty/maintui', lambda x: x.env.CLIENT and x.env.TUI),
103104
Subproject('3rdparty/vgui_support', lambda x: x.env.CLIENT),
104105
Subproject('3rdparty/MultiEmulator',lambda x: x.env.CLIENT),
105106
# Subproject('3rdparty/freevgui', lambda x: x.env.CLIENT),
@@ -137,6 +138,9 @@ def options(opt):
137138
grp.add_option('--enable-dedicated', action = 'store_true', dest = 'ENABLE_DEDICATED', default = False,
138139
help = 'enable building Xash Dedicated Server alongside client [default: %(default)s]')
139140

141+
grp.add_option('--enable-tui', action = 'store_true', dest = 'ENABLE_TUI', default = False,
142+
help = 'enable TUI main menu [default: %(default)s]')
143+
140144
grp.add_option('--gamedir', action = 'store', dest = 'GAMEDIR', default = 'valve',
141145
help = 'engine default (base) game directory [default: %(default)s]')
142146

@@ -415,6 +419,8 @@ def configure(conf):
415419
conf.env.CLIENT = False
416420
conf.env.LAUNCHER = False
417421

422+
conf.env.TUI = conf.options.ENABLE_TUI
423+
418424
conf.define_cond('SUPPORT_HL25_EXTENDED_STRUCTS', conf.options.SUPPORT_HL25_EXTENDED_STRUCTS)
419425

420426
if conf.env.SAILFISH == 'aurora':

0 commit comments

Comments
 (0)