Browse Source

wscript: do not set install_path on dos target, set build task names to "server" and "client"

hl_urbicide
mittorn 5 years ago
parent
commit
c6d793231c
  1. 3
      cl_dll/wscript
  2. 3
      dlls/wscript

3
cl_dll/wscript

@ -53,7 +53,7 @@ def build(bld):
if bld.env.DEST_OS == 'win32': if bld.env.DEST_OS == 'win32':
libs += ["USER32"] libs += ["USER32"]
if bld.env.DEST_OS not in ['android']: if bld.env.DEST_OS not in ['android', 'dos']:
install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR) install_path = os.path.join(bld.env.GAMEDIR, bld.env.CLIENT_DIR)
else: else:
install_path = bld.env.PREFIX install_path = bld.env.PREFIX
@ -61,6 +61,7 @@ def build(bld):
bld.shlib( bld.shlib(
source = source, source = source,
target = 'client' + bld.env.POSTFIX, target = 'client' + bld.env.POSTFIX,
name = 'client',
features = 'c cxx', features = 'c cxx',
includes = includes, includes = includes,
defines = defines, defines = defines,

3
dlls/wscript

@ -61,7 +61,7 @@ def build(bld):
libs = [] libs = []
if bld.env.DEST_OS not in ['android']: if bld.env.DEST_OS not in ['android', 'dos']:
install_path = os.path.join(bld.env.GAMEDIR, bld.env.SERVER_DIR) install_path = os.path.join(bld.env.GAMEDIR, bld.env.SERVER_DIR)
else: else:
install_path = bld.env.PREFIX install_path = bld.env.PREFIX
@ -69,6 +69,7 @@ def build(bld):
bld.shlib( bld.shlib(
source = source, source = source,
target = bld.env.SERVER_NAME + bld.env.POSTFIX, target = bld.env.SERVER_NAME + bld.env.POSTFIX,
name = 'server',
features = 'c cxx', features = 'c cxx',
includes = includes, includes = includes,
defines = defines, defines = defines,

Loading…
Cancel
Save