X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmakefile.unix;h=69749c241d1e95c7721a07e58a153d8cff4289ec;hp=9097e939b155ceee7d01f5b568cf8e133821ec13;hb=415da519893e8fef7a10007fc82934385addd03d;hpb=f33f1bcdfb992637d0805b5c3cf3dda7a1bd9e7a diff --git a/src/makefile.unix b/src/makefile.unix index 9097e93..69749c2 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -2,13 +2,16 @@ # 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 +# CC=clang +# CXX=clang++ + 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)) @@ -33,14 +36,6 @@ LIBS += \ -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 @@ -93,10 +88,14 @@ ifeq (${ARCH}, i686) 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) -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 @@ -110,6 +109,7 @@ OBJS= \ obj/netbase.o \ obj/addrman.o \ obj/crypter.o \ + obj/base58.o \ obj/key.o \ obj/db.o \ obj/init.o \ @@ -118,8 +118,11 @@ OBJS= \ 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 \ @@ -133,18 +136,10 @@ OBJS= \ obj/walletdb.o \ obj/noui.o \ obj/kernel.o \ - obj/pbkdf2.o \ - obj/scrypt.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 @@ -157,7 +152,7 @@ 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) make libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) @@ -165,24 +160,41 @@ OBJS += obj/txdb-bdb.o endif ifeq (${USE_ASM}, 1) -OBJS += obj/scrypt-arm.o obj/scrypt-x86.o obj/scrypt-x86_64.o +# 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 $@ $< -endif -ifneq (${USE_ASM}, 1) -OBJS += obj/scrypt-generic.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 $(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 @@ -199,22 +211,23 @@ obj/%.o: %.cpp -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) clean: -rm -f novacoind -rm -f obj/*.o - -rm -f obj/zerocoin/*.o -rm -f obj/*.P - -rm -f obj/zerocoin/*.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: