RPC scaninput: Add 8way implementation, but disable it for now.

[novacoin.git] / src / makefile.osx

diff --git a/src/makefile.osx b/src/makefile.osx
index 2048961..0903d6e 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
 
@@ -54,15 +53,9 @@ ifdef RELEASE
 # Compile for maximum compatibility and smallest size.
 # This requires that dependencies are compiled
 # the same way.
-CFLAGS = -O2 -msse2
+CFLAGS = -O2 -msse2 -mssse3
 else
-CFLAGS = -g -msse2
-endif
-
-ifeq  (${USE_SSSE3}, 1)
-# Intrinsic implementation of block copy
-DEFS += -DUSE_SSSE3
-CFLAGS += -mssse3
+CFLAGS = -g -msse2 -mssse3
 endif
 
 # ppc doesn't work because we don't support big-endian
@@ -102,18 +95,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
@@ -137,8 +118,8 @@ endif
 
 ifeq (${USE_ASM}, 1)
 # Assembler implementation
-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/sha2/asm/obj/copy_swap.o
+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 $@ $<
@@ -146,24 +127,15 @@ crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
 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 $@ $<
-
 crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-x86.S
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-x86_64.S
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
        $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha/asm/obj/sha-arm.o: crypto/sha2/asm/sha2-arm.S
-       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-
-crypto/sha2/asm/obj/copy_swap.o: crypto/sha2/asm/copy_swap.c
-       $(CC)  -c $(CFLAGS) -MMD -o $@ $<
-
 DEFS += -DUSE_ASM
 
 else
@@ -216,6 +188,9 @@ 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: