From 0e71fae00822c86da9c37b4b6ba342bb0717f0b0 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Tue, 29 Nov 2011 09:38:03 -0600 Subject: [PATCH] updates makefiles and Xcode project --- Makefile | 4 ++-- examples/echo_server/Makefile | 9 +++++---- websocketpp.xcodeproj/project.pbxproj | 8 ++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4062410d02..a19aaa1db8 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,8 @@ objects = network_utilities.o sha1.o base64.o md5.o uri.o -BOOST_LIB_PATH ?= /Users/zaphoyd/Documents/boost_1_48_0/stage/lib -BOOST_INCLUDE_PATH ?= /Users/zaphoyd/Documents/boost_1_48_0 +BOOST_LIB_PATH ?= /usr/local/lib +BOOST_INCLUDE_PATH ?= /usr/local/include libs = -lboost_system -lboost_date_time -lboost_regex -lboost_random -lboost_program_options diff --git a/examples/echo_server/Makefile b/examples/echo_server/Makefile index bbffeb2317..87f2fb4a10 100644 --- a/examples/echo_server/Makefile +++ b/examples/echo_server/Makefile @@ -1,7 +1,8 @@ -BOOST_PATH = /Users/zaphoyd/Documents/boost_1_48_0/stage/lib +BOOST_LIB_PATH ?= /usr/local/lib +BOOST_INCLUDE_PATH ?= /usr/local/include -CFLAGS = -O2 -I/Users/zaphoyd/Documents/boost_1_48_0 -LDFLAGS = -L/Users/zaphoyd/Documents/boost_1_48_0/stage/lib +CFLAGS = -O2 -I$(BOOST_INCLUDE_PATH) +LDFLAGS = -L$(BOOST_LIB_PATH) CXX ?= c++ SHARED ?= "1" @@ -9,7 +10,7 @@ SHARED ?= "1" ifeq ($(SHARED), 1) LDFLAGS := $(LDFLAGS) -lboost_system -lboost_date_time -lboost_program_options -lwebsocketpp else - LDFLAGS := $(LDFLAGS) $(BOOST_PATH)/libboost_system.a $(BOOST_PATH)/libboost_date_time.a $(BOOST_PATH)/libboost_regex.a -lcrypto -lssl ../../libwebsocketpp.a + LDFLAGS := $(LDFLAGS) $(BOOST_LIB_PATH)/libboost_system.a $(BOOST_LIB_PATH)/libboost_date_time.a $(BOOST_LIB_PATH)/libboost_regex.a -lcrypto -lssl ../../libwebsocketpp.a endif echo_server: echo_server.o diff --git a/websocketpp.xcodeproj/project.pbxproj b/websocketpp.xcodeproj/project.pbxproj index b107055a56..617e81c14d 100644 --- a/websocketpp.xcodeproj/project.pbxproj +++ b/websocketpp.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ B62A5A7214775ECF005F9EB0 /* libwebsocketpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B6DF1C721434A8280029A1B1 /* libwebsocketpp.dylib */; }; B62A5A7314778E5C005F9EB0 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE8D5D14730B2200B32547 /* libssl.dylib */; }; B62A5A7414778E65005F9EB0 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B6FE8D5B14730B1A00B32547 /* libcrypto.dylib */; }; + B6727429148517180029CF3E /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6727428148517180029CF3E /* uri.cpp */; }; + B672742A148517180029CF3E /* uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6727428148517180029CF3E /* uri.cpp */; }; + B672742D148531250029CF3E /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B6DF1CBF1434AF6A0029A1B1 /* libboost_regex.dylib */; }; B68288871437460E002BA48B /* chat_client_handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6828875143745DA002BA48B /* chat_client_handler.cpp */; }; B68288881437460E002BA48B /* chat_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6828877143745DA002BA48B /* chat_client.cpp */; }; B682888914374617002BA48B /* libwebsocketpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B6DF1C721434A8280029A1B1 /* libwebsocketpp.dylib */; }; @@ -163,6 +166,7 @@ B62A5A6F14774CD5005F9EB0 /* uri.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = uri.hpp; path = src/uri.hpp; sourceTree = ""; }; B62A5A7014774F08005F9EB0 /* md5.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = md5.hpp; path = src/md5/md5.hpp; sourceTree = ""; }; B62A5A71147759EA005F9EB0 /* common.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = common.hpp; path = src/common.hpp; sourceTree = ""; }; + B6727428148517180029CF3E /* uri.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = uri.cpp; path = src/uri.cpp; sourceTree = ""; }; B6828875143745DA002BA48B /* chat_client_handler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = chat_client_handler.cpp; path = examples/chat_client/chat_client_handler.cpp; sourceTree = ""; }; B6828876143745DA002BA48B /* chat_client_handler.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = chat_client_handler.hpp; path = examples/chat_client/chat_client_handler.hpp; sourceTree = ""; }; B6828877143745DA002BA48B /* chat_client.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = chat_client.cpp; path = examples/chat_client/chat_client.cpp; sourceTree = ""; }; @@ -256,6 +260,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B672742D148531250029CF3E /* libboost_regex.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -409,6 +414,7 @@ B62A5A71147759EA005F9EB0 /* common.hpp */, B62A5A511473EBB0005F9EB0 /* connection.hpp */, B62A5A6F14774CD5005F9EB0 /* uri.hpp */, + B6727428148517180029CF3E /* uri.cpp */, B62A5A521473EBB0005F9EB0 /* endpoint.hpp */, B6DF1C921434AC470029A1B1 /* websocket_client_session.cpp */, B6DF1C931434AC470029A1B1 /* websocket_client_session.hpp */, @@ -770,6 +776,7 @@ B6DF1C7A1434AB740029A1B1 /* network_utilities.cpp in Sources */, B6DF1C831434ABE20029A1B1 /* base64.cpp in Sources */, B6DF1C8A1434AC330029A1B1 /* sha1.cpp in Sources */, + B6727429148517180029CF3E /* uri.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -781,6 +788,7 @@ B6DF1CC41434AF9E0029A1B1 /* network_utilities.cpp in Sources */, B6DF1C841434ABE20029A1B1 /* base64.cpp in Sources */, B6DF1C8B1434AC330029A1B1 /* sha1.cpp in Sources */, + B672742A148517180029CF3E /* uri.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };