X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmakefile.bsd;h=c7a2f24ccac22d6e79d71f8d63d553abd2ffb4a7;hp=550fa73cffb0c8ea7728335c3adf76ac71855be7;hb=415da519893e8fef7a10007fc82934385addd03d;hpb=528d8a3948a27dbdcb8123b42ff7b8375a7277aa diff --git a/src/makefile.bsd b/src/makefile.bsd index 550fa73..c7a2f24 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -2,19 +2,20 @@ # 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 +ARCH:=$(uname -m) + +# CC:=clang +# CXX:=clang++ LINK:=$(CXX) -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 @@ -22,8 +23,6 @@ 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 @@ -38,14 +37,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 @@ -53,7 +44,6 @@ endif LIBS+= \ -Wl,-B$(LMODE2) \ -l z \ - -l dl \ -l pthread @@ -93,9 +83,18 @@ LIBS+= \ DEBUGFLAGS=-g +ifeq (${ARCH}, i386) + 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=-O0 -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 @@ -109,6 +108,7 @@ OBJS= \ obj/netbase.o \ obj/addrman.o \ obj/crypter.o \ + obj/base58.o \ obj/key.o \ obj/db.o \ obj/init.o \ @@ -117,8 +117,11 @@ OBJS= \ obj/main.o \ obj/miner.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 \ @@ -132,22 +135,10 @@ OBJS= \ 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 \ + obj/ipcollector.o all: novacoind @@ -160,71 +151,81 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) gmake libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) OBJS += obj/txdb-bdb.o endif -test check: test_novacoin FORCE - ./test_novacoin +ifeq (${USE_ASM}, 1) -# auto-generated dependencies: --include obj/*.P --include obj-test/*.P +DEFS += -DUSE_ASM -obj/build.h: FORCE - /bin/sh ../share/genbuild.sh obj/build.h -version.cpp: obj/build.h -DEFS += -DHAVE_BUILD_INFO +# 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 -obj/scrypt-x86.o: scrypt-x86.S +crypto/scrypt/asm/obj/scrypt-x86.o: crypto/scrypt/asm/scrypt-x86.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< -obj/scrypt-x86_64.o: scrypt-x86_64.S +crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< -obj/scrypt-arm.o: scrypt-arm.S +crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< -obj/%.o: %.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) +crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp + $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< -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) +else +ifeq (${USE_SSE2}, 1) +# Intrinsic implementation +DEFS += -DUSE_SSE2 +OBJS += crypto/scrypt/intrin/obj/scrypt-sse2.o -novacoind: $(OBJS:obj/%=obj/%) - $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) +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 -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) +obj/build.h: FORCE + /bin/sh ../share/genbuild.sh obj/build.h +version.cpp: obj/build.h +DEFS += -DHAVE_BUILD_INFO -obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< +obj/%.o: %.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) -test_novacoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS) +novacoind: $(OBJS:obj/%=obj/%) + $(LINK) $(xCXXFLAGS) -o $@ $^ $(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: