preliminary work to allow specifying custom paths to boost install

This commit is contained in:
Peter Thorson
2011-11-28 08:40:04 -06:00
parent 7d7e8e853a
commit 0e0fd97b83
3 changed files with 20 additions and 9 deletions

View File

@@ -28,17 +28,22 @@
# It's authors were Jonathan Wallace and Bernhard Fluehmann.
objects = network_utilities.o sha1.o base64.o md5.o
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
libs = -lboost_system -lboost_date_time -lboost_regex -lboost_random -lboost_program_options
//libs_static = $(BOOST_PATH)/boost_system.a $(BOOST_PATH)/boost_regex.a
OS=$(shell uname)
# Defaults
ifeq ($(OS), Darwin)
cxxflags_default = -c -O2 -DNDEBUG
cxxflags_default = -c -Wall -O2 -DNDEBUG -I$(BOOST_INCLUDE_PATH)
else
cxxflags_default = -c -O2 -DNDEBUG
cxxflags_default = -c -Wall -O2 -DNDEBUG -I$(BOOST_INCLUDE_PATH)
endif
cxxflags_small = -c
cxxflags_debug = -c -g
@@ -65,6 +70,7 @@ PIC ?= PIC
BUILD_TYPE ?= "default"
SHARED ?= "1"
# Internal Variables
inst_path = $(exec_prefix)/$(libdir)
include_path = $(prefix)/$(includedir)

View File

@@ -1,5 +1,7 @@
CFLAGS = -O2
LDFLAGS =
BOOST_PATH = /Users/zaphoyd/Documents/boost_1_48_0/stage/lib
CFLAGS = -O2 -I/Users/zaphoyd/Documents/boost_1_48_0
LDFLAGS = -L/Users/zaphoyd/Documents/boost_1_48_0/stage/lib
CXX ?= c++
SHARED ?= "1"
@@ -7,7 +9,7 @@ SHARED ?= "1"
ifeq ($(SHARED), 1)
LDFLAGS := $(LDFLAGS) -lboost_system -lboost_date_time -lboost_program_options -lwebsocketpp
else
LDFLAGS := $(LDFLAGS) -lboost_system -lboost_date_time -lboost_regex -lcrypto -lssl ../../libwebsocketpp.a
LDFLAGS := $(LDFLAGS) $(BOOST_PATH)/libboost_system.a $(BOOST_PATH)/libboost_date_time.a $(BOOST_PATH)/libboost_regex.a -lcrypto -lssl ../../libwebsocketpp.a
endif
echo_server: echo_server.o

View File

@@ -1,5 +1,8 @@
CFLAGS = -O2
LDFLAGS =
BOOST_LIB_PATH ?= /Users/zaphoyd/Documents/boost_1_48_0/stage/lib
BOOST_INCLUDE_PATH ?= /Users/zaphoyd/Documents/boost_1_48_0
CFLAGS = -O2 -I$(BOOST_INCLUDE_PATH)
LDFLAGS = -L$(BOOST_LIB_PATH)
CXX ?= c++
SHARED ?= "1"
@@ -7,7 +10,7 @@ SHARED ?= "1"
ifeq ($(SHARED), 1)
LDFLAGS := $(LDFLAGS) -lboost_system -lboost_date_time -lboost_regex -lboost_unit_test_framework -lwebsocketpp
else
LDFLAGS := $(LDFLAGS) -lboost_system -lboost_date_time -lboost_regex -lboost_unit_test_framework ../../libwebsocketpp.a
LDFLAGS := $(LDFLAGS) $(BOOST_LIB_PATH)/libboost_system.a $(BOOST_LIB_PATH)/libboost_date_time.a $(BOOST_LIB_PATH)/libboost_regex.a $(BOOST_LIB_PATH)/libboost_unit_test_framework.a ../../libwebsocketpp.a
endif
tests: parsing.cpp