BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wscript improvements

pull/9/head
bebopagogo 2020-02-29 23:56:05 -05:00
parent 106f4efc17
commit 40375daedc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@ -161,8 +161,10 @@ def build(ctx):
# Hack to force clang to statically link stuff # Hack to force clang to statically link stuff
if 'clang++' == ctx.env.COMPILER_CXX: if 'clang++' == ctx.env.COMPILER_CXX:
use = ['protoObjs', 'normObjs'] use = ['protoObjs', 'normObjs']
source = ['src/common/normApi.cpp']
else: else:
use = ['norm_stlib', 'protolib_st'] use = ['norm_stlib', 'protolib_st']
source = []
normapp = ctx.program( normapp = ctx.program(
# Need to explicitly set a different name, because # Need to explicitly set a different name, because
@ -172,7 +174,7 @@ def build(ctx):
includes = ['include', 'protolib/include'], includes = ['include', 'protolib/include'],
use = use, use = use,
defines = [], defines = [],
source = ['src/common/{0}.cpp'.format(x) for x in [ source = source + ['src/common/{0}.cpp'.format(x) for x in [
'normPostProcess', 'normPostProcess',
'normApp', 'normApp',
]], ]],
@ -236,9 +238,11 @@ def _make_simple_example(ctx, name, path='examples'):
# Hack to force clang to statically link stuff # Hack to force clang to statically link stuff
if 'clang++' == ctx.env.COMPILER_CXX: if 'clang++' == ctx.env.COMPILER_CXX:
use = ['protoObjs', 'normObjs'] use = ['protoObjs', 'normObjs']
source = ['src/common/normApi.cpp']
else: else:
use = ['norm_stlib', 'protolib_st'] 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: if 'normClient' == name or 'normServer' == name:
source.append('%s/normSocket.cpp' % path) source.append('%s/normSocket.cpp' % path)
example = ctx.program( example = ctx.program(