From 40375daedc0ee5c29dd4c6a50c83e77f62a7fac5 Mon Sep 17 00:00:00 2001 From: bebopagogo Date: Sat, 29 Feb 2020 23:56:05 -0500 Subject: [PATCH] wscript improvements --- wscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index d7f6894..595dd84 100644 --- a/wscript +++ b/wscript @@ -161,8 +161,10 @@ def build(ctx): # Hack to force clang to statically link stuff if 'clang++' == ctx.env.COMPILER_CXX: use = ['protoObjs', 'normObjs'] + source = ['src/common/normApi.cpp'] else: use = ['norm_stlib', 'protolib_st'] + source = [] normapp = ctx.program( # Need to explicitly set a different name, because @@ -172,7 +174,7 @@ def build(ctx): includes = ['include', 'protolib/include'], use = use, defines = [], - source = ['src/common/{0}.cpp'.format(x) for x in [ + source = source + ['src/common/{0}.cpp'.format(x) for x in [ 'normPostProcess', 'normApp', ]], @@ -236,9 +238,11 @@ def _make_simple_example(ctx, name, path='examples'): # Hack to force clang to statically link stuff if 'clang++' == ctx.env.COMPILER_CXX: use = ['protoObjs', 'normObjs'] + source = ['src/common/normApi.cpp'] else: use = ['norm_stlib', 'protolib_st'] - source = ['{0}/{1}.cpp'.format(path, name)] + source = [] + source += ['{0}/{1}.cpp'.format(path, name)] if 'normClient' == name or 'normServer' == name: source.append('%s/normSocket.cpp' % path) example = ctx.program(