Always build with IPV6 support

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index 96cf542..a567bc4 100644 (file)
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -6,6 +6,7 @@
 # Mac OS X makefile for bitcoin
 # Originally by Laszlo Hanyecz (solar@heliacal.net)
 
+CC=llvm-gcc
 CXX=llvm-g++
 DEPSDIR=/opt/local
 
@@ -20,7 +21,6 @@ LIBPATHS= \
  -L"$(DEPSDIR)/lib/db48"
 
 USE_LEVELDB:=0
-USE_IPV6:=1
 
 LIBS= -dead_strip
 
@@ -47,7 +47,7 @@ LIBS += \
  -lz
 endif
 
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS
 
 ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
@@ -82,6 +82,7 @@ OBJS= \
     obj/stun.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
+    obj/rpccrypt.o \
     obj/rpcdump.o \
     obj/rpcnet.o \
     obj/rpcmining.o \
@@ -95,13 +96,12 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
+    obj/uint256.o \
     obj/kernel_worker.o \
     obj/ecies.o \
-    obj/cryptogram.o
-
-ifneq (${USE_IPV6}, -)
-       DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
+    obj/cryptogram.o \
+    obj/ipcollector.o \
+    obj/serialize.o
 
 all: novacoind
 
@@ -114,7 +114,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB
 DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
 OBJS += obj/txdb-leveldb.o
 leveldb/libleveldb.a:
-       @echo "Building LevelDB ..."; cd leveldb; make; cd ..
+       @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) make; cd ..
 obj/txdb-leveldb.o: leveldb/libleveldb.a
 else
 OBJS += obj/txdb-bdb.o
@@ -131,7 +131,7 @@ crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
-       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -std=c++11 -MMD -o $@ $<
 
 DEFS += -DUSE_ASM
 
@@ -148,7 +148,7 @@ else
 OBJS += crypto/scrypt/generic/obj/scrypt-generic.o
 
 crypto/scrypt/generic/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
-       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -std=c++11 -MMD -o $@ $<
 endif
 endif
 
@@ -162,7 +162,7 @@ version.cpp: obj/build.h
 DEFS += -DHAVE_BUILD_INFO
 
 obj/%.o: %.cpp
-       $(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+       $(CXX) -c $(CFLAGS) -std=c++11 -MMD -MF $(@:%.o=%.d) -o $@ $<
        @cp $(@:%.o=%.d) $(@:%.o=%.P); \
          sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
              -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \