Fix Mac build to not error on -lcrypto

client/Makefile

@@ -6,7 +6,7 @@ PROJECT_OBJS := clientmain.o
 
 INCLUDES := $(BOOST_INCLUDE) -I../common -I../stuncore -I../networkutils -I../resources
 LIB_PATH := -L../common -L../stuncore -L../networkutils
-LIBS := -lnetworkutils -lstuncore -lcommon -lcrypto
+LIBS := -lnetworkutils -lstuncore -lcommon 
 
 
 all: $(PROJECT_TARGET)
@@ -15,6 +15,6 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET) 
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS)
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)
 
 

common.inc

-#BOOST_INCLUDE := -I/Users/jselbie/boost_1_52_0
+BOOST_INCLUDE := -I/Users/jselbielocal/boost_1_62_0
 #OPENSSL_INCLUDE := -I/Users/jselbie/openssl/include
 
 DEFINES := -DNDEBUG
@@ -12,6 +12,7 @@ RELEASE_FLAGS := -O2
 DEBUG_FLAGS := -g
 PROFILE_FLAGS := -O2 -g
 FLAVOR_FLAGS = $(RELEASE_FLAGS)
+CRYPTO_LIBS := -lcrypto
 
 
 #SOLARIS HACK
@@ -20,8 +21,10 @@ ifeq ($(UNAME),SunOS)
   SOCKET_LIBS := -lsocket -lnsl
 endif
 
-
-
+#Mac hack
+ifeq ($(UNAME),Darwin)
+  CRYPTO_LIBS :=
+endif
 
 .PHONY: all clean debug
 

server/Makefile

@@ -5,7 +5,7 @@ PROJECT_OBJS := main.o server.o stunconnection.o stunsocketthread.o tcpserver.o
 
 INCLUDES := $(BOOST_INCLUDE) $(OPENSSL_INCLUDE) -I../common -I../stuncore -I../networkutils -I../resources
 LIB_PATH := -L../common -L../stuncore -L../networkutils
-LIBS := -lnetworkutils -lstuncore -lcommon -pthread -lcrypto
+LIBS := -lnetworkutils -lstuncore -lcommon -pthread 
 
 
 all: $(PROJECT_TARGET)
@@ -14,6 +14,6 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET) 
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS)
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)
 
 

testcode/Makefile

@@ -5,7 +5,7 @@ PROJECT_OBJS := testatomichelpers.o testbuilder.o testclientlogic.o testcmdline.
  
 INCLUDES := $(BOOST_INCLUDE) $(OPENSSL_INCLUDE) -I../common -I../stuncore -I../networkutils
 LIB_PATH := -L../networkutils -L../stuncore -L../common
-LIBS := -lnetworkutils -lstuncore -lcommon -lpthread -lcrypto
+LIBS := -lnetworkutils -lstuncore -lcommon -lpthread 
 
 
 all: $(PROJECT_TARGET)
@@ -14,8 +14,7 @@ clean:
 	rm -f $(PROJECT_OBJS) $(PROJECT_TARGET)
 
 $(PROJECT_TARGET): $(PROJECT_OBJS)
-	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS)
-
+	$(LINK.cpp) -o $@ $^ $(LIB_PATH) $(LIBS) $(SOCKET_LIBS) $(CRYPTO_LIBS)