From 60831cfc336b784d0c1a425475c42381b7f2088f Mon Sep 17 00:00:00 2001 From: Julien Kauffmann Date: Mon, 31 Mar 2014 21:50:40 +0200 Subject: [PATCH] Updated dependencies --- libs/asiotap/SConscript | 4 +++- samples/asiotap/endpoint/SConscript | 1 + samples/asiotap/proxy/SConscript | 1 + samples/asiotap/routes/SConscript | 1 + samples/asiotap/tap/SConscript | 1 + samples/asiotap/tun/SConscript | 1 + samples/fscp/client/SConscript | 1 + samples/fscp/schat/SConscript | 1 + 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/asiotap/SConscript b/libs/asiotap/SConscript index 052b2c41..fc5208ac 100644 --- a/libs/asiotap/SConscript +++ b/libs/asiotap/SConscript @@ -7,7 +7,9 @@ env = env.Clone() local_include_dir = Dir(os.path.join('include', name)) env.Prepend(CPPPATH=[local_include_dir]) +sources = list(set(env.RGlob('src', '*.cpp')) - set(env.RGlob(os.path.join('src', 'windows'), '*.cpp'))) + includes = env.RInstall(dirs['root'], local_include_dir, ['*.hpp']) -library = env.StaticLibrary(target=os.path.join(str(dirs['lib']), name), source=env.RGlob('src', '*.cpp')) +library = env.StaticLibrary(target=os.path.join(str(dirs['lib']), name), source=list(sources)) Return('library includes') diff --git a/samples/asiotap/endpoint/SConscript b/samples/asiotap/endpoint/SConscript index 7ac07daa..8936892c 100644 --- a/samples/asiotap/endpoint/SConscript +++ b/samples/asiotap/endpoint/SConscript @@ -3,6 +3,7 @@ import os libraries = [ 'asiotap', + 'boost_system', ] Import('env dirs name') diff --git a/samples/asiotap/proxy/SConscript b/samples/asiotap/proxy/SConscript index 7ac07daa..8936892c 100644 --- a/samples/asiotap/proxy/SConscript +++ b/samples/asiotap/proxy/SConscript @@ -3,6 +3,7 @@ import os libraries = [ 'asiotap', + 'boost_system', ] Import('env dirs name') diff --git a/samples/asiotap/routes/SConscript b/samples/asiotap/routes/SConscript index 7ac07daa..8936892c 100644 --- a/samples/asiotap/routes/SConscript +++ b/samples/asiotap/routes/SConscript @@ -3,6 +3,7 @@ import os libraries = [ 'asiotap', + 'boost_system', ] Import('env dirs name') diff --git a/samples/asiotap/tap/SConscript b/samples/asiotap/tap/SConscript index 7ac07daa..8936892c 100644 --- a/samples/asiotap/tap/SConscript +++ b/samples/asiotap/tap/SConscript @@ -3,6 +3,7 @@ import os libraries = [ 'asiotap', + 'boost_system', ] Import('env dirs name') diff --git a/samples/asiotap/tun/SConscript b/samples/asiotap/tun/SConscript index 7ac07daa..8936892c 100644 --- a/samples/asiotap/tun/SConscript +++ b/samples/asiotap/tun/SConscript @@ -3,6 +3,7 @@ import os libraries = [ 'asiotap', + 'boost_system', ] Import('env dirs name') diff --git a/samples/fscp/client/SConscript b/samples/fscp/client/SConscript index d1b4a484..755fc0bc 100644 --- a/samples/fscp/client/SConscript +++ b/samples/fscp/client/SConscript @@ -6,6 +6,7 @@ libraries = [ 'cryptoplus', 'boost_thread', 'boost_system', + 'crypto', ] Import('env dirs name') diff --git a/samples/fscp/schat/SConscript b/samples/fscp/schat/SConscript index d1b4a484..755fc0bc 100644 --- a/samples/fscp/schat/SConscript +++ b/samples/fscp/schat/SConscript @@ -6,6 +6,7 @@ libraries = [ 'cryptoplus', 'boost_thread', 'boost_system', + 'crypto', ] Import('env dirs name')