merge
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Wed, 10 Sep 2008 11:34:33 +0100
changeset 3671 eacfb4274caa
parent 3670 81b9840155de (current diff)
parent 3669 e96e61efb9a5 (diff)
child 3672 817729f77408
merge
--- a/src/internet-stack/wscript	Wed Sep 10 11:33:30 2008 +0100
+++ b/src/internet-stack/wscript	Wed Sep 10 11:34:33 2008 +0100
@@ -75,7 +75,7 @@
     ok = False
     if arch == 'x86_64' or arch == 'i686' or arch == 'i586' or arch == 'i486' or arch == 'i386':
         conf.env['NSC_ENABLED'] = 'yes'
-        conf.define('NETWORK_SIMULATION_CRADLE', 1)
+        conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
         e = conf.create_library_configurator()
         e.mandatory = True
         e.name = 'dl'
--- a/src/simulator/wscript	Wed Sep 10 11:33:30 2008 +0100
+++ b/src/simulator/wscript	Wed Sep 10 11:34:33 2008 +0100
@@ -16,7 +16,7 @@
 
 def configure(conf):
     if Params.g_options.high_precision_as_double:
-        conf.add_define('USE_HIGH_PRECISION_DOUBLE', 1)
+        conf.define('USE_HIGH_PRECISION_DOUBLE', 1)
         conf.env['USE_HIGH_PRECISION_DOUBLE'] = 1
         highprec = 'long double'
     else: