# 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
-USE_LEVELDB:=1
LINK:=$(CXX)
-ARCH:=$(system lscpu | head -n 1 | awk '{print $2}')
+ARCH:=$(shell uname -m)
-DEFS=-DBOOST_SPIRIT_THREADSAFE
+DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
-TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
-
LMODE = dynamic
LMODE2 = dynamic
ifdef STATIC
ifeq (${STATIC}, all)
LMODE2 = static
endif
-else
- TESTDEFS += -DBOOST_TEST_DYN_LINK
endif
# for boost 1.37, add -mt to the boost libraries
-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
EXT_OPTIONS=-msse2
endif
+xOPT_LEVEL=-O2
+ifeq (${USE_O3}, 1)
+ xOPT_LEVEL=-O3
+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=-O2 $(EXT_OPTIONS) -fopenmp -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
obj/netbase.o \
obj/addrman.o \
obj/crypter.o \
+ obj/base58.o \
obj/key.o \
obj/db.o \
obj/init.o \
obj/miner.o \
obj/main.o \
obj/net.o \
+ obj/ntp.o \
+ obj/stun.o \
obj/protocol.o \
obj/bitcoinrpc.o \
+ obj/rpccrypt.o \
obj/rpcdump.o \
obj/rpcnet.o \
obj/rpcmining.o \
obj/walletdb.o \
obj/noui.o \
obj/kernel.o \
- obj/pbkdf2.o \
- obj/scrypt.o \
- obj/scrypt-arm.o \
- obj/scrypt-x86.o \
- obj/scrypt-x86_64.o \
- obj/zerocoin/Accumulator.o \
- obj/zerocoin/AccumulatorProofOfKnowledge.o \
- obj/zerocoin/Coin.o \
- obj/zerocoin/CoinSpend.o \
- obj/zerocoin/Commitment.o \
- obj/zerocoin/ParamGeneration.o \
- obj/zerocoin/Params.o \
- obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
- obj/zerocoin/SpendMetaData.o \
- obj/zerocoin/ZeroTest.o
+ obj/kernel_worker.o \
+ obj/ecies.o \
+ obj/cryptogram.o
all: novacoind
OBJS += obj/txdb-bdb.o
endif
-test check: test_novacoin FORCE
- ./test_novacoin
+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
+
+crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+DEFS += -DUSE_ASM
+
+else
+ifeq (${USE_SSE2}, 1)
+# Intrinsic implementation
+DEFS += -DUSE_SSE2
+OBJS += crypto/scrypt/intrin/obj/scrypt-sse2.o
+
+crypto/scrypt/intrin/obj/scrypt-sse2.o: crypto/scrypt/intrin/scrypt-sse2.cpp
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+else
+# Generic implementation
+OBJS += crypto/scrypt/generic/obj/scrypt-generic.o
+
+crypto/scrypt/generic/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
+ $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+endif
+endif
+
# auto-generated dependencies:
-include obj/*.P
--include obj-test/*.P
obj/build.h: FORCE
/bin/sh ../share/genbuild.sh obj/build.h
version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO
-obj/scrypt-x86.o: scrypt-x86.S
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-x86_64.o: scrypt-x86_64.S
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
-obj/scrypt-arm.o: scrypt-arm.S
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
obj/%.o: %.cpp
$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
rm -f $(@:%.o=%.d)
-obj/zerocoin/%.o: zerocoin/%.cpp
- $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
- @cp $(@:%.o=%.d) $(@:%.o=%.P); \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
-
novacoind: $(OBJS:obj/%=obj/%)
$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-
-obj-test/%.o: test/%.cpp
- $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
- @cp $(@:%.o=%.d) $(@:%.o=%.P); \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- rm -f $(@:%.o=%.d)
-
-test_novacoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
- $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS)
-
clean:
- -rm -f novacoind test_novacoin
+ -rm -f novacoind
-rm -f obj/*.o
- -rm -f obj/zerocoin/*.o
- -rm -f obj-test/*.o
-rm -f obj/*.P
- -rm -f obj/zerocoin/*.P
- -rm -f obj-test/*.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 obj/build.h
FORCE: