From aaf53ad8623b5b0808bc7a0a13157eb875c426fe Mon Sep 17 00:00:00 2001 From: Meeh Date: Mon, 14 Jul 2014 05:59:54 +0200 Subject: [PATCH] Updating the OSX makefile. Should work from 10.7 -> 10.10 now. --- Makefile.osx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.osx b/Makefile.osx index e294971b..2f36f484 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -1,6 +1,5 @@ -#CC = clang++ -CC = g++ -CFLAGS = -g -Wall -std=c++11 -lstdc++ +CC = clang++ +CFLAGS = -g -Wall -std=c++11 -lstdc++ -I/usr/local/include OBJECTS = obj/CryptoConst.o obj/base64.o obj/NTCPSession.o obj/RouterInfo.o obj/Transports.o \ obj/RouterContext.o obj/NetDb.o obj/LeaseSet.o obj/Tunnel.o obj/TunnelEndpoint.o \ obj/TunnelGateway.o obj/TransitTunnel.o obj/I2NPProtocol.o obj/Log.o obj/Garlic.o \ @@ -8,13 +7,14 @@ OBJECTS = obj/CryptoConst.o obj/base64.o obj/NTCPSession.o obj/RouterInfo.o obj/ obj/UPnP.o obj/TunnelPool.o obj/HTTPProxy.o obj/AddressBook.o obj/Daemon.o \ obj/DaemonLinux.o obj/SSUData.o obj/i2p.o obj/aes.o INCFLAGS = -DCRYPTOPP_DISABLE_ASM -LDFLAGS = -Wl,-rpath,/usr/local/lib -lcryptopp -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lpthread +LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib -lcryptopp -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options -lpthread LIBS = -#check if AES-NI is supported by CPU -ifneq ($(shell grep -c aes /proc/cpuinfo),0) - CPU_FLAGS = -DAESNI -endif +# OSX Notes +# 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 +# Found no good way to detect it from command line. TODO: Might be some osx sysinfo magic +CPU_FLAGS = -DAESNI # Apple Mac OSX UNAME_S := $(shell uname -s)