-L"$(DEPSDIR)/lib" \
-L"$(DEPSDIR)/lib/db48"
-USE_UPNP:=0
USE_LEVELDB:=0
USE_IPV6:=1
-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.
# This requires that dependencies are compiled
# the same way.
-CFLAGS = -O2 -msse2
+CFLAGS = -O2 -msse2 -mssse3
else
-CFLAGS = -g -msse2
+CFLAGS = -g -msse2 -mssse3
endif
# ppc doesn't work because we don't support big-endian
obj/main.o \
obj/miner.o \
obj/net.o \
+ obj/ntp.o \
obj/stun.o \
obj/protocol.o \
obj/bitcoinrpc.o \
obj/walletdb.o \
obj/noui.o \
obj/kernel.o \
- obj/scrypt.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
+ obj/kernel_worker.o
ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
ifeq (${USE_ASM}, 1)
-OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o
+# 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
-obj/scrypt-x86.o: scrypt-x86.S
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
+ $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-obj/scrypt-x86_64.o: scrypt-x86_64.S
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
-ifneq (${USE_ASM}, 1)
-OBJS += obj/scrypt-generic.o
+crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+ $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-obj/scrypt-generic.o: scrypt-generic.c
- $(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
+crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
+ $(CXX) -c $(CFLAGS) -MMD -o $@ $<
-ifneq (${USE_SSE2}, 1) and eq (${USE_ASM}, 1)
+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
+ifeq (${USE_SSE2}, 1)
+# Intrinsic implementation
DEFS += -DUSE_SSE2
-OBJS += obj/scrypt-sse2.o
+OBJS += crypto/scrypt/intrin/obj/scrypt-sse2.o
+
+crypto/scrypt/intrin/obj/scrypt-sse2.o: crypto/scrypt/intrin/scrypt-sse2.cpp
+ $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+else
+# Generic implementation
+OBJS += crypto/scrypt/generic/obj/scrypt-generic.o
-obj/scrypt-sse2.o: scrypt-sse2.cpp
- $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+crypto/scrypt/generic/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
+ $(CXX) -c $(CFLAGS) -MMD -o $@ $<
endif
endif
-rm -f novacoind
-rm -f obj/*.o
-rm -f obj/*.P
+ -rm -f 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: