Additional fixes for Apple/Linux

Author: arturl

Release/Makefile

@@ -82,12 +82,14 @@ export BOOST_SYSTEM=boost_system
 export BOOST_THREAD=boost_thread
 export BOOST_LOCALE=boost_locale
 export BOOST_REGEX=boost_regex
+export BOOST_FILE_SYSTEM=boost_filesystem
 endif
 ifeq ($(UNAME),APPLE)
 export BOOST_SYSTEM=boost_system-mt
 export BOOST_THREAD=boost_thread-mt
 export BOOST_LOCALE=boost_locale-mt
 export BOOST_REGEX=boost_regex-mt
+export BOOST_FILE_SYSTEM=boost_filesystem-mt
 endif
 
 tests: src

Release/src/Makefile

@@ -23,7 +23,7 @@ SOURCES = \
 ifeq ($(UNAME),APPLE)
 	SOURCES += pplx/apple/pplxapple.cpp
 else
-	SOURCES += pplx/apple/pplxlinux.cpp
+	SOURCES += pplx/linux/pplxlinux.cpp
 endif
 
 
@@ -86,11 +86,17 @@ PKGCONFIG_CFLAGS = $(shell pkg-config libxml++-2.6 --cflags)
 PKGCONFIG_LIBS = $(shell pkg-config libxml++-2.6 --libs) $(shell pkg-config libssl --libs)
 endif
 
+ifeq ($(UNAME),APPLE)
+PLATFORM_FLAGS = -framework CoreFoundation
+endif
+ifeq ($(UNAME),LINUX)
+PLATFORM_FLAGS = -pthread
+endif
+
 #-fpch-deps -MMD not useful with a single monolithic PCH
 
 CXXFLAGS = -fPIC -std=c++11 $(STRICT_BASE_CXXFLAGS) -I../include -I./pch $(WARNINGS) $(PKGCONFIG_CFLAGS)
-# Use "mt" version of boost for Apple, and no-mt for Linux 
-LIBS = $(PKGCONFIG_LIBS) -framework CoreFoundation -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -l$(BOOST_LOCALE) -l$(BOOST_REGEX) -lstdc++ -lm # these are explicit for clang
+LIBS = $(PKGCONFIG_LIBS) $(PLATFORM_FLAGS) -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -l$(BOOST_LOCALE) -l$(BOOST_REGEX) -lstdc++ -lm # these are explicit for clang
 LDFLAGS = $(BASE_LDFLAGS)
 
 ifeq ($(OUTPUT_DIR),)

Release/src/json/json.cpp

@@ -519,6 +519,7 @@ bool json::value::operator==(const json::value &other) const
     case Array:
         return static_cast<const json::details::_Array*>(this->m_value.get())->is_equal(static_cast<const json::details::_Array*>(other.m_value.get()));
     }
+    UNREACHABLE;
 }
 
 web::json::value& web::json::value::operator [] (const utility::string_t &key)

Release/tests/Common/TestRunner/Makefile

@@ -1,6 +1,6 @@
 CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I../../../include/ -I../UnitTestpp/ 
 LDFLAGS=-L$(OUTPUT_DIR)
-LDLIBS=-l$(BOOST_SYSTEM) -lboost_filesystem-mt -lunittestpp -ldl
+LDLIBS=-l$(BOOST_SYSTEM) -l$(BOOST_FILE_SYSTEM) -lunittestpp -ldl
 
 .PHONY: all
 

Release/tests/Common/UnitTestpp/Makefile

@@ -1,4 +1,9 @@
-CXXFLAGS += -g -Wall -Wno-unknown-pragmas -W -Winline -ansi -I. -stdlib=libc++ -std=c++11 -fPIC -I$(CASABLANCA_INCLUDE_DIR)
+CXXFLAGS += -g -Wall -Wno-unknown-pragmas -W -Winline -ansi -I. -std=c++11 -fPIC -I$(CASABLANCA_INCLUDE_DIR)
+
+ifeq ($(UNAME),APPLE)
+CXXFLAGS += -stdlib=libc++
+endif
+
 # LDFLAGS ?= 
 SED = sed
 MV = mv
@@ -72,7 +77,7 @@ all: $(lib)
 
 $(lib): $(objects)
 	@echo Creating $(lib) library...
-	@$(CXX) -stdlib=libc++ -shared -o $(lib) $(objects) -lstdc++ -lm 
+	@$(CXX) $(CXXFLAGS) -shared -o $(lib) $(objects) -lstdc++ -lm 
 
 $(test): $(lib) $(test_objects)
 	@mkdir -p bin/win32_gcc_static_debug

Release/tests/Common/utilities/Makefile

@@ -1,4 +1,10 @@
-CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I../../../include/ -I../../Common/UnitTestpp/ -include ../../../include/compat/apple_compat.h -L"$(OUTPUT_DIR)" -fPIC -Iinclude
+CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I../../../include/ -I../../Common/UnitTestpp/ -L"$(OUTPUT_DIR)" -fPIC -Iinclude
+
+ifeq ($(UNAME),APPLE)
+	CXXFLAGS += -include ../../../include/compat/apple_compat.h
+else
+	CXXFLAGS += -include ../../../include/compat/linux_compat.h
+endif
 
 LDLIBS=-lcasablanca -lunittestpp -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -lpthread -lstdc++
 

Release/tests/Functional/http/utilities/Makefile

@@ -1,4 +1,11 @@
-CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I. -I$(CASABLANCA_INCLUDE_DIR) -I$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/ -I$(CASABLANCA_TESTS_DIR)/Common/utilities/include -Iinclude -include compat/apple_compat.h
+CXXFLAGS=$(LAX_BASE_CXXFLAGS) -I. -I$(CASABLANCA_INCLUDE_DIR) -I$(CASABLANCA_TESTS_DIR)/Common/UnitTestpp/ -I$(CASABLANCA_TESTS_DIR)/Common/utilities/include -Iinclude
+
+ifeq ($(UNAME),APPLE)
+	CXXFLAGS += -include compat/apple_compat.h
+else
+	CXXFLAGS += -include compat/linux_compat.h
+endif
+
 LDFLAGS=-L"$(OUTPUT_DIR)" $(BASE_LDFLAGS)
 LDLIBS=-lcasablanca -lunittestpp -l$(BOOST_SYSTEM) -l$(BOOST_THREAD) -l$(BOOST_LOCALE) -lpthread -lstdc++