Merge branch 'master' of https://github.com/zaphoyd/websocketpp

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)
-
-

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',