# 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
-l ssl \
-l crypto
-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
ifeq (${ARCH}, i686)
- EXT_OPTIONS=-msse2
+ EXT_OPTIONS=-msse2 -mssse3
+endif
+
+ifeq (${ARCH}, x86_64)
+ EXT_OPTIONS=-mssse3
endif
xOPT_LEVEL=-O2
obj/wallet.o \
obj/walletdb.o \
obj/noui.o \
- obj/kernel.o
+ obj/kernel.o \
+ obj/kernel_worker.o
all: novacoind
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/scrypt/asm/obj/scrypt-x86.o: crypto/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 $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+DEFS += -DUSE_ASM
+
else
ifeq (${USE_SSE2}, 1)
# Intrinsic implementation
-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: