Explorar o código

remove duplicate=0

tanghai %!s(int64=15) %!d(string=hai) anos
pai
achega
e4b92110b3
Modificáronse 3 ficheiros con 21 adicións e 3 borrados
  1. 1 1
      SConstruct
  2. 18 0
      src/experimental/SConscript
  3. 2 2
      src/experimental/http_server/posix_main.cc

+ 1 - 1
SConstruct

@@ -29,5 +29,5 @@ env.Append(CPPPATH=Dir(env['root']).abspath)
 
 Export('env')
 
-SConscript('src/SConscript', build_dir=env['root'], duplicate=0)
+SConscript('src/SConscript', build_dir=env['root'])
 

+ 18 - 0
src/experimental/SConscript

@@ -13,3 +13,21 @@ experimental_env.Append(LIBS=[
 experimental_env.Program('chat/chat_message.cc')
 experimental_env.Program('chat/chat_server.cc')
 experimental_env.Program('chat/posix_chat_client.cc')
+
+http_server_srcs = [
+	"http_server/connection.cc",
+	"http_server/connection_manager.cc",
+	"http_server/mime_types.cc",
+	"http_server/posix_main.cc",
+	"http_server/reply.cc",
+	"http_server/request_handler.cc",
+	"http_server/request_parser.cc",
+	"http_server/server.cc",
+]
+
+http_server_objs = []
+
+for src in http_server_srcs:
+	http_server_objs += experimental_env.Object(src)
+	
+experimental_env.Program(http_server_objs)

+ 2 - 2
src/experimental/http_server/posix_main.cc

@@ -41,8 +41,8 @@ int main(int argc, char* argv[])
 
 
 		// Run server in background thread.
-		http::server::server s(argv[1], argv[2], argv[3]);
-		boost::thread t(boost::bind(&http::server::server::run, &s));
+		http_server::server s(argv[1], argv[2], argv[3]);
+		boost::thread t(boost::bind(&http_server::server::run, &s));
 
 
 		// Restore previous signals.