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

[novacoin.git] / src / makefile.bsd

diff --git a/src/makefile.bsd b/src/makefile.bsd
index 09dc14b..88f8b2b 100644 (file)
--- a/src/makefile.bsd
+++ b/src/makefile.bsd
@@ -2,9 +2,9 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-USE_UPNP:=0
 USE_LEVELDB:=0
 USE_IPV6:=1
+ARCH:=$(uname -m)
 
 LINK:=$(CXX)
 
@@ -34,14 +34,6 @@ LIBS += \
    -l crypto \
    -l execinfo
 
-ifndef USE_UPNP
-       override USE_UPNP = -
-endif
-ifneq (${USE_UPNP}, -)
-       LIBS += -l miniupnpc
-       DEFS += -DUSE_UPNP=$(USE_UPNP)
-endif
-
 ifneq (${USE_IPV6}, -)
        DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
@@ -88,20 +80,22 @@ LIBS+= \
 
 DEBUGFLAGS=-g
 
+ifeq (${ARCH}, i386)
+    EXT_OPTIONS=-msse2 -mssse3
+endif
+
+ifeq (${ARCH}, amd64)
+    EXT_OPTIONS=-mssse3
+endif
+
 xOPT_LEVEL=-O2
 ifeq (${USE_O3}, 1)
     xOPT_LEVEL=-O3
 endif
 
-ifeq  (${USE_SSSE3}, 1)
-# Intrinsic implementation of block copy
-DEFS += -DUSE_SSSE3
-xOPT_LEVEL += -mssse3
-endif
-
 # CXXFLAGS can be specified on the make command line, so we use xCXXFLAGS that only
 # adds some defaults in front. Unfortunately, CXXFLAGS=... $(CXXFLAGS) does not work.
-xCXXFLAGS=$(xOPT_LEVEL) -msse2 -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
+xCXXFLAGS=$(xOPT_LEVEL) $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
     $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
 
 # LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only
@@ -237,9 +231,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 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: