mirror of https://github.com/FWGS/hlsdk-xash3d
Merge branch 'master' into redempt
This commit is contained in:
commit
4d03144f0b
|
@ -41,7 +41,6 @@ project (HLSDK-PORTABLE)
|
||||||
# USER DEFINES \
|
# USER DEFINES \
|
||||||
################\
|
################\
|
||||||
option(USE_VGUI "Enable VGUI1." OFF)
|
option(USE_VGUI "Enable VGUI1." OFF)
|
||||||
option(USE_VGUI2 "Enable VGUI2. UNDONE" OFF)
|
|
||||||
option(USE_NOVGUI_MOTD "Prefer non-VGUI MOTD when USE_VGUI is enabled" OFF)
|
option(USE_NOVGUI_MOTD "Prefer non-VGUI MOTD when USE_VGUI is enabled" OFF)
|
||||||
option(USE_NOVGUI_SCOREBOARD "Prefer non-VGUI Scoreboard when USE_VGUI is enabled" OFF)
|
option(USE_NOVGUI_SCOREBOARD "Prefer non-VGUI Scoreboard when USE_VGUI is enabled" OFF)
|
||||||
option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
|
option(USE_VOICEMGR "Enable VOICE MANAGER." OFF)
|
||||||
|
|
|
@ -10,8 +10,6 @@ def options(opt):
|
||||||
|
|
||||||
grp.add_option('--enable-vgui', action = 'store_true', dest = 'USE_VGUI', default = False,
|
grp.add_option('--enable-vgui', action = 'store_true', dest = 'USE_VGUI', default = False,
|
||||||
help = 'Enable VGUI1')
|
help = 'Enable VGUI1')
|
||||||
grp.add_option('--enable-vgui2', action = 'store_true', dest = 'USE_VGUI2', default = False,
|
|
||||||
help = 'Enable VGUI2. UNDONE')
|
|
||||||
grp.add_option('--enable-novgui-motd', action = 'store_true', dest = 'USE_NOVGUI_MOTD', default = False,
|
grp.add_option('--enable-novgui-motd', action = 'store_true', dest = 'USE_NOVGUI_MOTD', default = False,
|
||||||
help = 'Prefer non-VGUI MOTD when USE_VGUI is enabled')
|
help = 'Prefer non-VGUI MOTD when USE_VGUI is enabled')
|
||||||
grp.add_option('--enable-novgui-scoreboard', action = 'store_true', dest = 'USE_NOVGUI_SCOREBOARD', default = False,
|
grp.add_option('--enable-novgui-scoreboard', action = 'store_true', dest = 'USE_NOVGUI_SCOREBOARD', default = False,
|
||||||
|
@ -27,6 +25,10 @@ def configure(conf):
|
||||||
conf.env.USE_NOVGUI_SCOREBOARD = conf.options.USE_NOVGUI_SCOREBOARD
|
conf.env.USE_NOVGUI_SCOREBOARD = conf.options.USE_NOVGUI_SCOREBOARD
|
||||||
conf.env.USE_VOICEMGR = conf.options.USE_VOICEMGR
|
conf.env.USE_VOICEMGR = conf.options.USE_VOICEMGR
|
||||||
conf.env.GOLDSOURCE_SUPPORT = conf.options.GOLDSOURCE_SUPPORT
|
conf.env.GOLDSOURCE_SUPPORT = conf.options.GOLDSOURCE_SUPPORT
|
||||||
|
|
||||||
|
if conf.env.GOLDSOURCE_SUPPORT:
|
||||||
|
conf.check_cc(lib='dl')
|
||||||
|
|
||||||
if conf.env.USE_VGUI:
|
if conf.env.USE_VGUI:
|
||||||
conf.load('vgui')
|
conf.load('vgui')
|
||||||
if not conf.check_vgui():
|
if not conf.check_vgui():
|
||||||
|
@ -46,7 +48,7 @@ def build(bld):
|
||||||
'game_shared/voice_vgui_tweakdlg.cpp',
|
'game_shared/voice_vgui_tweakdlg.cpp',
|
||||||
'game_shared/voice_gamemgr.cpp',
|
'game_shared/voice_gamemgr.cpp',
|
||||||
'game_shared/voice_status.cpp']
|
'game_shared/voice_status.cpp']
|
||||||
|
|
||||||
if bld.env.USE_VGUI:
|
if bld.env.USE_VGUI:
|
||||||
defines += ['USE_VGUI']
|
defines += ['USE_VGUI']
|
||||||
libs += ['VGUI']
|
libs += ['VGUI']
|
||||||
|
@ -54,7 +56,7 @@ def build(bld):
|
||||||
defines += ['USE_NOVGUI_MOTD']
|
defines += ['USE_NOVGUI_MOTD']
|
||||||
else:
|
else:
|
||||||
excluded_files += ['MOTD.cpp']
|
excluded_files += ['MOTD.cpp']
|
||||||
|
|
||||||
if bld.env.USE_NOVGUI_SCOREBOARD:
|
if bld.env.USE_NOVGUI_SCOREBOARD:
|
||||||
defines += ['USE_NOVGUI_SCOREBOARD']
|
defines += ['USE_NOVGUI_SCOREBOARD']
|
||||||
else:
|
else:
|
||||||
|
|
2
wscript
2
wscript
|
@ -175,8 +175,6 @@ def configure(conf):
|
||||||
for i in a:
|
for i in a:
|
||||||
conf.check_cc(lib = i)
|
conf.check_cc(lib = i)
|
||||||
else:
|
else:
|
||||||
if conf.env.GOLDSOURCE_SUPPORT:
|
|
||||||
conf.check_cc(lib='dl')
|
|
||||||
conf.check_cc(lib='m')
|
conf.check_cc(lib='m')
|
||||||
|
|
||||||
# check if we can use C99 tgmath
|
# check if we can use C99 tgmath
|
||||||
|
|
Loading…
Reference in New Issue