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

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index d2ff2ed..5caeec9 100644
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -16,12 +16,15 @@ modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statis
 for module in modules:
   anna_libs.append ("anna_" + module)
   module = module.replace("_", ".")
-  kk = pwd.replace (pPath, ("source/" + module + "/"))
   anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/")))
 
 # dynamic lib:
 anna_libs.append ("anna_dynamicLauncherProcedure")
-dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/debug")
+anna_libs.append ("anna_testing")
+variant = env ['VARIANT']
+dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/" + variant)
+anna_libpaths.append (dynamic_libpath)
+dynamic_libpath = os.path.join (pwd, "../../../../source/testing/" + variant)
 anna_libpaths.append (dynamic_libpath)
 
 anna_rlibs = list(anna_libs)
@@ -42,12 +45,12 @@ 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])
+#dynamic_include = os.path.join (pwd, "../../../../include/anna/testing/")
+#localEnv.Append (CPPPATH = [current_directory, dynamic_include])
 
+result = localEnv.Program (pName, Glob ('*.cpp'))
 Return ('result')