Remove UPNP support & do some cleanup.

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index 7c37722..70ded54 100644 (file)
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -19,7 +19,6 @@ LIBPATHS= \
  -L"$(DEPSDIR)/lib" \
  -L"$(DEPSDIR)/lib/db48"
 
-USE_UPNP:=0
 USE_LEVELDB:=0
 USE_IPV6:=1
 
@@ -48,7 +47,7 @@ LIBS += \
  -lz
 endif
 
-DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS
+DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
 ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
@@ -59,6 +58,12 @@ else
 CFLAGS = -g -msse2
 endif
 
+ifeq  (${USE_SSSE3}, 1)
+# Intrinsic implementation of block copy
+DEFS += -DUSE_SSSE3
+CFLAGS += -mssse3
+endif
+
 # ppc doesn't work because we don't support big-endian
 CFLAGS += -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \
     $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
@@ -78,6 +83,7 @@ OBJS= \
     obj/main.o \
     obj/miner.o \
     obj/net.o \
+    obj/ntp.o \
     obj/stun.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
@@ -95,18 +101,6 @@ OBJS= \
     obj/noui.o \
     obj/kernel.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
@@ -130,35 +124,46 @@ endif
 
 ifeq (${USE_ASM}, 1)
 # Assembler implementation
-OBJS += scrypt-asm/obj/scrypt-arm.o scrypt-asm/obj/scrypt-x86.o scrypt-asm/obj/scrypt-x86_64.o scrypt-asm/obj/asm-wrapper.o
+OBJS += crypto/scrypt/asm/obj/scrypt-arm.o 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-arm.o 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 $@ $<
+
+crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-x86.o: scrypt-asm/scrypt-x86.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-arm.o: scrypt-asm/scrypt-arm.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+DEFS += -DUSE_ASM
 
-scrypt-asm/obj/asm-wrapper.o: scrypt-asm/asm-wrapper.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
 else
 ifeq  (${USE_SSE2}, 1)
 # Intrinsic implementation
 DEFS += -DUSE_SSE2
-OBJS += scrypt-intrin/obj/scrypt-sse2.o
+OBJS += crypto/scrypt/intrin/obj/scrypt-sse2.o
 
-scrypt-intrin/obj/scrypt-sse2.o: scrypt-intrin/scrypt-sse2.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/scrypt/intrin/obj/scrypt-sse2.o: crypto/scrypt/intrin/scrypt-sse2.cpp
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
-ifneq (${USE_ASM}, 1)
 # Generic implementation
-OBJS += obj/scrypt-generic.o
+OBJS += crypto/scrypt/generic/obj/scrypt-generic.o
 
-obj/scrypt-generic.o: scrypt-generic.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
+crypto/scrypt/generic/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 endif
 endif
 
@@ -186,12 +191,18 @@ clean:
        -rm -f obj/*.o
        -rm -f obj/*.P
        -rm -f obj/*.d
-       -rm -f scrypt-asm/obj/*.o
-       -rm -f scrypt-asm/obj/*.P
-       -rm -f scrypt-asm/obj/*.d
-       -rm -f scrypt-intrin/obj/*.o
-       -rm -f scrypt-intrin/obj/*.P
-       -rm -f scrypt-intrin/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 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: