X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FSConscript;h=04ad2a517d44bb1f97a2c756df313ee2cff98fcc;hb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8;hp=d2ff2ed236978ab5d385581e76ab3ff6a19fcd07;hpb=8b3eb3637cbe90fbabe70ec5667cce58cb7e368b;p=anna.git

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index d2ff2ed..04ad2a5 100644
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -12,7 +12,7 @@ pwd = str(Dir ('.').abspath);
 anna_libpaths = []
 anna_libs = []
 
-modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm' ];
+modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm', 'testing' ];
 for module in modules:
   anna_libs.append ("anna_" + module)
   module = module.replace("_", ".")
@@ -21,7 +21,8 @@ for module in modules:
 
 # dynamic lib:
 anna_libs.append ("anna_dynamicLauncherProcedure")
-dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/debug")
+variant = env ['VARIANT']
+dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/" + variant)
 anna_libpaths.append (dynamic_libpath)
 
 anna_rlibs = list(anna_libs)
@@ -42,12 +43,10 @@ localEnv.Append(LIBPATH = anna_libpaths)
 
 # Linking #################################################################
 
-# Process includes (avoid mandatory using of quoted includes and ../ paths from testing directory):
+# Process includes:
 current_directory = Dir ('.').abspath
-testing_include = os.path.join (current_directory, "testing")
 dynamic_include = os.path.join (pwd, "../../../../dynamic/launcher/default/")
-localEnv.Append (CPPPATH = [current_directory, testing_include, dynamic_include])
-
-result = localEnv.Program (pName, Glob ('*.cpp') + Glob ('testing/*.cpp'))
+localEnv.Append (CPPPATH = [current_directory, dynamic_include])
 
+result = localEnv.Program (pName, Glob ('*.cpp'))
 Return ('result')