diff --git a/engine/common/dedicated.c b/engine/common/dedicated.c index d9be5944..4d5dc298 100644 --- a/engine/common/dedicated.c +++ b/engine/common/dedicated.c @@ -252,4 +252,9 @@ byte TextureToGamma( byte b ) return b; } +byte LightToTexGamma( byte b ) +{ + return b; +} + #endif // XASH_DEDICATED diff --git a/engine/wscript b/engine/wscript index cb1de00e..424dff7b 100644 --- a/engine/wscript +++ b/engine/wscript @@ -237,7 +237,7 @@ def build(bld): app_name = 'xash3d-fwgs' ) else: - if bld.env.SINGLE_BINARY: + if bld.env.DISABLE_LAUNCHER: install_path = bld.env.BINDIR program = 'cxxprogram' if is_cxx_link else 'cprogram' if bld.env.STATIC: diff --git a/wscript b/wscript index ee19eafd..fbbae3d6 100644 --- a/wscript +++ b/wscript @@ -78,7 +78,7 @@ SUBDIRS = [ Subproject('3rdparty/mainui', lambda x: not x.env.DEDICATED), Subproject('3rdparty/vgui_support', lambda x: not x.env.DEDICATED), Subproject('stub/client', lambda x: not x.env.DEDICATED), - Subproject('game_launch', lambda x: not x.env.DEDICATED and not x.env.DISABLE_LAUNCHER), + Subproject('game_launch', lambda x: not x.env.DISABLE_LAUNCHER), # disable only by external dependency presense Subproject('3rdparty/opus', lambda x: not x.env.HAVE_SYSTEM_OPUS and not x.env.DEDICATED), @@ -351,7 +351,7 @@ def configure(conf): conf.env.SUPPORT_BSP2_FORMAT = conf.options.SUPPORT_BSP2_FORMAT # disable game_launch compiling on platform where it's not needed - conf.env.DISABLE_LAUNCHER = conf.env.DEST_OS in ['android', 'nswitch', 'psvita', 'dos'] or conf.env.MAGX + conf.env.DISABLE_LAUNCHER = conf.env.DEST_OS in ['android', 'nswitch', 'psvita', 'dos'] or conf.env.MAGX or conf.env.DEDICATED if conf.env.SAILFISH == 'aurora': conf.env.DEFAULT_RPATH = '/usr/share/su.xash.Engine/lib'