From c6d793231c4044eb1e57b227e44b200dc1858228 Mon Sep 17 00:00:00 2001 From: mittorn Date: Wed, 12 Feb 2020 15:40:06 +0700 Subject: [PATCH] wscript: do not set install_path on dos target, set build task names to "server" and "client" --- cl_dll/wscript | 3 ++- dlls/wscript | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cl_dll/wscript b/cl_dll/wscript index b45242d5..3bc40d56 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -53,7 +53,7 @@ def build(bld): if bld.env.DEST_OS == 'win32': 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) else: install_path = bld.env.PREFIX @@ -61,6 +61,7 @@ def build(bld): bld.shlib( source = source, target = 'client' + bld.env.POSTFIX, + name = 'client', features = 'c cxx', includes = includes, defines = defines, diff --git a/dlls/wscript b/dlls/wscript index 24e93e71..2a469153 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -61,7 +61,7 @@ def build(bld): 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) else: install_path = bld.env.PREFIX @@ -69,6 +69,7 @@ def build(bld): bld.shlib( source = source, target = bld.env.SERVER_NAME + bld.env.POSTFIX, + name = 'server', features = 'c cxx', includes = includes, defines = defines,