X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FSConscript;h=5caeec9e4c966e31f3b940f6d745ef4c83fbd1b7;hb=f548ce5889cd69ed0c9fb17e2dccf47fbeb41784;hp=249a878928cecc626b0e4268023edcf57700e0d9;hpb=4c3f0a4d7e4db76996404d80c6f939548fca656f;p=anna.git

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index 249a878..5caeec9 100644
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -11,12 +11,22 @@ pPath = pName.replace("_", "/") + "/"
 pwd = str(Dir ('.').abspath);
 anna_libpaths = []
 anna_libs = []
+
 modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm' ];
 for module in modules:
   anna_libs.append ("anna_" + module)
   module = module.replace("_", ".")
   anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/")))
 
+# dynamic lib:
+anna_libs.append ("anna_dynamicLauncherProcedure")
+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)
 anna_rlibs.reverse()
 
@@ -32,13 +42,15 @@ localEnv.MergeFlags (system_library)
 
 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")
-localEnv.Append (CPPPATH = [current_directory, testing_include])
-
-result = localEnv.Program (pName, Glob ('*.cpp') + Glob ('testing/*.cpp'))
+dynamic_include = os.path.join (pwd, "../../../../dynamic/launcher/default/")
+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')