Fix Mac OSX build error.

This commit is contained in:
Mikal Villa 2015-01-03 21:33:27 +01:00
parent 729cc4330e
commit 79d13eb6cb
2 changed files with 19 additions and 1 deletions

View File

@ -1,10 +1,15 @@
CXX = clang++ CXX = clang++
CXXFLAGS = -g -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM CXXFLAGS = -g -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM -DMAC_OSX
#CXXFLAGS = -g -O2 -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM #CXXFLAGS = -g -O2 -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM
INCFLAGS = -I/usr/local/include INCFLAGS = -I/usr/local/include
LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
ifeq ($(USE_UPNP),1)
LDFLAGS += -ldl
CXXFLAGS += -DUSE_UPNP
endif
# OSX Notes # OSX Notes
# http://www.hutsby.net/2011/08/macs-with-aes-ni.html # http://www.hutsby.net/2011/08/macs-with-aes-ni.html
# Seems like all recent Mac's have AES-NI, after firmware upgrade 2.2 # Seems like all recent Mac's have AES-NI, after firmware upgrade 2.2

13
SOCKS.h
View File

@ -8,6 +8,19 @@
#include "Streaming.h" #include "Streaming.h"
#include "I2PTunnel.h" #include "I2PTunnel.h"
#ifdef MAC_OSX
/*
* - MAXHOSTNAMELEN from <sys/param.h>
* on MacOS X 10.3, FreeBSD 6.0, NetBSD 3.0, OpenBSD 3.8, AIX 5.1, HP-UX 11,
* IRIX 6.5, OSF/1 5.1, Interix 3.5, Haiku,
* - MAXHOSTNAMELEN from <netdb.h>
* on Solaris 10, Cygwin, BeOS,
* - 256 on mingw.
*
* */
#define HOST_NAME_MAX 256
#endif
namespace i2p namespace i2p
{ {
namespace proxy namespace proxy