Skip to content

Commit

Permalink
engine: fix dedicated build
Browse files Browse the repository at this point in the history
  • Loading branch information
a1batross committed Jan 14, 2024
1 parent 00b2ca7 commit a247e13
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions engine/common/dedicated.c
Expand Up @@ -252,4 +252,9 @@ byte TextureToGamma( byte b )
return b;
}

byte LightToTexGamma( byte b )
{
return b;
}

#endif // XASH_DEDICATED
2 changes: 1 addition & 1 deletion engine/wscript
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions wscript
Expand Up @@ -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),
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit a247e13

Please sign in to comment.