F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with HEAD

Browse Source
This commit is contained in:
Mathieu Lacage
2007-12-11 10:25:34 +01:00
parent b54c43b966 07e46fb8aa
commit b8fbe8341f
7 changed files with 163 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wscript
View File

@@ -48,17 +48,13 @@ def configure(conf):
conf.sub_config('simulator')
blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
conf.env['NS3_MODULE_PATH'] = [os.path.join(blddir, 'lib')]
conf.env['NS3_MODULE_PATH'] = [blddir]
if Params.g_options.enable_rpath:
conf.env.append_value('RPATH', '-Wl,-rpath=%s' % (os.path.join(blddir),))
## Used to link the 'run-tests' program with all of ns-3 code
conf.env['NS3_MODULES'] = ['ns3-' + module.split('/')[-1] for module in all_modules]
if Params.g_options.enable_modules:
conf.env['NS3_ENABLED_MODULES'] = ['ns3-'+mod for mod in
Params.g_options.enable_modules.split(',')]
def create_ns3_module(bld, name, dependencies=()):
module = bld.create_obj('cpp', 'objects')