Fix getbalance() bug

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index f24eb52..0c4c1d3 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
 
@@ -19,9 +20,7 @@ LIBPATHS= \
  -L"$(DEPSDIR)/lib" \
  -L"$(DEPSDIR)/lib/db48"
 
-USE_UPNP:=0
 USE_LEVELDB:=0
-USE_IPV6:=1
 
 LIBS= -dead_strip
 
@@ -70,6 +69,7 @@ OBJS= \
     obj/netbase.o \
     obj/addrman.o \
     obj/crypter.o \
+    obj/base58.o \
     obj/key.o \
     obj/db.o \
     obj/init.o \
@@ -78,9 +78,11 @@ OBJS= \
     obj/main.o \
     obj/miner.o \
     obj/net.o \
+    obj/ntp.o \
     obj/stun.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
+    obj/rpccrypt.o \
     obj/rpcdump.o \
     obj/rpcnet.o \
     obj/rpcmining.o \
@@ -89,29 +91,18 @@ OBJS= \
     obj/rpcrawtransaction.o \
     obj/script.o \
     obj/sync.o \
+    obj/timedata.o \
     obj/util.o \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/pbkdf2.o \
     obj/kernel.o \
-    obj/scrypt.o
-
-ifndef USE_UPNP
-       override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-       DEFS += -DUSE_UPNP=$(USE_UPNP)
-ifdef STATIC
-       LIBS += $(DEPSDIR)/lib/libminiupnpc.a
-else
-       LIBS += -lminiupnpc
-endif
-endif
-
-ifneq (${USE_IPV6}, -)
-       DEFS += -DUSE_IPV6=$(USE_IPV6)
-endif
+    obj/uint256.o \
+    obj/kernel_worker.o \
+    obj/ecies.o \
+    obj/cryptogram.o \
+    obj/ipcollector.o \
+    obj/serialize.o
 
 all: novacoind
 
@@ -124,34 +115,44 @@ 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
 endif
 
 ifeq (${USE_ASM}, 1)
-OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o
+# Assembler implementation
+OBJS += crypto/scrypt/asm/obj/scrypt-x86.o crypto/scrypt/asm/obj/scrypt-x86_64.o crypto/scrypt/asm/obj/asm-wrapper.o
 
-obj/scrypt-x86.o: scrypt-x86.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-obj/scrypt-x86_64.o: scrypt-x86_64.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
-ifneq (${USE_ASM}, 1)
-OBJS += obj/scrypt-generic.o
+crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-obj/scrypt-generic.o: scrypt-generic.c
-       $(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
+crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
+       $(CXX) -c $(CFLAGS) -std=c++11 -MMD -o $@ $<
+
+DEFS += -DUSE_ASM
 
+else
 ifeq  (${USE_SSE2}, 1)
-    DEFS += -DUSE_SSE2    
-    OBJS += obj/scrypt-sse2.o
-obj/scrypt-sse2.o: scrypt-sse2.cpp
-       $(CXX) -c  $(CFLAGS) -MMD -o $@ $<
+# Intrinsic implementation
+DEFS += -DUSE_SSE2
+OBJS += crypto/scrypt/intrin/obj/scrypt-sse2.o
+
+crypto/scrypt/intrin/obj/scrypt-sse2.o: crypto/scrypt/intrin/scrypt-sse2.cpp
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+else
+# Generic implementation
+OBJS += crypto/scrypt/generic/obj/scrypt-generic.o
+
+crypto/scrypt/generic/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
+       $(CXX) -c $(CFLAGS) -std=c++11 -MMD -o $@ $<
 endif
+endif
+
 
 # auto-generated dependencies:
 -include obj/*.P
@@ -162,7 +163,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); \
@@ -175,6 +176,16 @@ clean:
        -rm -f novacoind
        -rm -f obj/*.o
        -rm -f obj/*.P
+       -rm -f obj/*.d
+       -rm -f crypto/scrypt/asm/obj/*.o
+       -rm -f crypto/scrypt/asm/obj/*.P
+       -rm -f crypto/scrypt/asm/obj/*.d
+       -rm -f crypto/scrypt/intrin/obj/*.o
+       -rm -f crypto/scrypt/intrin/obj/*.P
+       -rm -f crypto/scrypt/intrin/obj/*.d
+       -rm -f crypto/scrypt/generic/obj/*.o
+       -rm -f crypto/scrypt/generic/obj/*.P
+       -rm -f crypto/scrypt/generic/obj/*.d
        -rm -f obj/build.h
 
 FORCE: