SunnyQjm/websocketpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into permessage-deflate

Browse Source 
Conflicts:
	examples/scratch_client/SConscript
This commit is contained in:
Peter Thorson
2013-07-10 19:10:03 -05:00
parent eb362007ab 28ac69c800
commit ba0094a0eb
34 changed files with 336 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/scratch_client/SConscript
+3 -3
View File
@@ -18,7 +18,7 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
else:
ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
prgs += env.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
Return('prgs')