Merge pull request #361 from svost/master

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index c5959c9..e0a00c8 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
 
@@ -53,9 +54,9 @@ ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
 # This requires that dependencies are compiled
 # the same way.
-CFLAGS = -O2 -msse2 -mssse3
+CFLAGS = -O2 -msse2
 else
-CFLAGS = -g -msse2 -mssse3
+CFLAGS = -g -msse2
 endif
 
 # ppc doesn't work because we don't support big-endian
@@ -82,6 +83,7 @@ OBJS= \
     obj/stun.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
+    obj/rpccrypt.o \
     obj/rpcdump.o \
     obj/rpcnet.o \
     obj/rpcmining.o \
@@ -95,7 +97,10 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/kernel_worker.o
+    obj/kernel_worker.o \
+    obj/ecies.o \
+    obj/cryptogram.o \
+    obj/ipcollector.o
 
 ifneq (${USE_IPV6}, -)
        DEFS += -DUSE_IPV6=$(USE_IPV6)
@@ -112,7 +117,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
@@ -121,7 +126,6 @@ endif
 ifeq (${USE_ASM}, 1)
 # 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
-OBJS += crypto/sha2/asm/obj/sha2-x86.o crypto/sha2/asm/obj/sha2-x86_64.o
 
 crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
@@ -132,12 +136,6 @@ crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
-       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
-crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
-       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
 DEFS += -DUSE_ASM
 
 else
@@ -190,9 +188,6 @@ clean:
        -rm -f crypto/scrypt/generic/obj/*.o
        -rm -f crypto/scrypt/generic/obj/*.P
        -rm -f crypto/scrypt/generic/obj/*.d
-       -rm -f crypto/sha2/asm/obj/*.o
-       -rm -f crypto/sha2/asm/obj/*.P
-       -rm -f crypto/sha2/asm/obj/*.d
        -rm -f obj/build.h
 
 FORCE: