diff --git a/source/forstio/SConscript b/source/forstio/SConscript index 1a02351..03830aa 100644 --- a/source/forstio/SConscript +++ b/source/forstio/SConscript @@ -25,12 +25,13 @@ objects_static = [] base_lib_env.add_source_files(objects_static, env.sources + env.driver_sources, shared=False); env.library_static = base_lib_env.StaticLibrary('#build/forstio', [objects_static]); -# Set Alias -env.Alias('library', [env.library_shared, env.library_static]); -env.Default('library'); - # Export to other libs Export('base_lib_env') #SConscript("rpc/SConscript"); SConscript("tls/SConscript"); + +# Set Alias +env.Alias('library_base', [env.library_shared, env.library_static]); +env.Alias('library', ['library_base', 'library_tls']); +env.Default('library'); diff --git a/source/forstio/tls/SConscript b/source/forstio/tls/SConscript index 3620e5a..a24b676 100644 --- a/source/forstio/tls/SConscript +++ b/source/forstio/tls/SConscript @@ -5,9 +5,25 @@ import os.path import glob -Import('env') +Import('base_lib_env'); +Import('env'); dir_path = Dir('.').abspath env.tls_sources += sorted(glob.glob(dir_path + "/*.cpp")) env.tls_headers += sorted(glob.glob(dir_path + "/*.h")) + +tls_lib_env = base_lib_env.Clone(); + +### Shared lib + +objects_shared = [] +tls_lib_env.add_source_files(objects_shared, env.tls_sources, shared=True); +env.tls_library_shared = tls_lib_env.SharedLibrary('#build/forstio-tls', [objects_shared, env.library_shared]); + +### Static lib + + +### Set alias +env.Alias('library_tls', [env.tls_library_shared]); +