From c6bb4912b29af67a4e437270d4de0292a0d3eff3 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 15 Mar 2012 14:11:21 +0100 Subject: [PATCH 1/2] fix scons build --- examples/chat_client/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/chat_client/SConscript b/examples/chat_client/SConscript index c987382aa6..4b3b8c44ff 100644 --- a/examples/chat_client/SConscript +++ b/examples/chat_client/SConscript @@ -8,7 +8,7 @@ Import('platform_libs') localenv = env.Clone () -sources = ["chat_client","chat_client_handler.cpp"] +sources = ["chat_client.cpp","chat_client_handler.cpp"] LIBS = [wslib, platform_libs] + boostlibs(['system', 'date_time', From 09c541185d31ef8b3cbe27e1632241f2634e93a0 Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Thu, 15 Mar 2012 14:27:25 +0100 Subject: [PATCH 2/2] disable TLS build on Win .. needs OpenSSL dev .. --- SConstruct | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 5b29895c3c..2caaf0c01a 100644 --- a/SConstruct +++ b/SConstruct @@ -72,11 +72,15 @@ else: platform_libs = [] tls_libs = [] +tls_build = False + if env['PLATFORM'] == 'posix': platform_libs = ['pthread', 'rt'] tls_libs = ['ssl', 'crypto'] + tls_build = True elif env['PLATFORM'] == 'darwin': tls_libs = ['ssl', 'crypto'] + tls_build = True elif env['PLATFORM'].startswith('win'): # Win/VC++ supports autolinking. nothing to do. pass @@ -110,9 +114,10 @@ echo_server = SConscript('#/examples/echo_server/SConscript', variant_dir = builddir + 'echo_server', duplicate = 0) -echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript', - variant_dir = builddir + 'echo_server_tls', - duplicate = 0) +if tls_build: + echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript', + variant_dir = builddir + 'echo_server_tls', + duplicate = 0) echo_client = SConscript('#/examples/echo_client/SConscript', variant_dir = builddir + 'echo_client', @@ -129,5 +134,3 @@ chat_server = SConscript('#/examples/chat_server/SConscript', concurrent_server = SConscript('#/examples/concurrent_server/SConscript', variant_dir = builddir + 'concurrent_server', duplicate = 0) - -