X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.osx;h=758c1ed9cebf4a91956dc79472e3e03a6f32c0c6;hb=1663f4a94dbb36331d2930c89eb51c0213200236;hp=a5fb4ac496effc49ccb1b72395e1707170df6aa6;hpb=25c505a6185c1045257ef8c746ea6de97805b45a;p=novacoin.git diff --git a/src/makefile.osx b/src/makefile.osx index a5fb4ac..758c1ed 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -19,18 +19,14 @@ LIBPATHS= \ -L"$(DEPSDIR)/lib" \ -L"$(DEPSDIR)/lib/db48" -USE_UPNP:=1 +USE_UPNP:=0 +USE_LEVELDB:=0 USE_IPV6:=1 -USE_LEVELDB:=1 LIBS= -dead_strip -TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data) - ifdef STATIC # Build STATIC if you are redistributing the bitcoind binary -TESTLIBS += \ - $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a LIBS += \ $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \ $(DEPSDIR)/lib/libboost_system-mt.a \ @@ -41,8 +37,6 @@ LIBS += \ $(DEPSDIR)/lib/libcrypto.a \ -lz else -TESTLIBS += \ - -lboost_unit_test_framework-mt LIBS += \ -ldb_cxx-4.8 \ -lboost_system-mt \ @@ -52,22 +46,27 @@ LIBS += \ -lssl \ -lcrypto \ -lz -TESTDEFS += -DBOOST_TEST_DYN_LINK endif -DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE +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 = -mmacosx-version-min=10.5 -arch x86_64 -O3 -msse2 +CFLAGS = -O2 -msse2 else CFLAGS = -g -msse2 endif +ifeq (${USE_SSSE3}, 1) +# Intrinsic implementation of block copy +DEFS += -DUSE_SSSE3 +CFLAGS += -mssse3 +endif + # ppc doesn't work because we don't support big-endian -CFLAGS += -fopenmp -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ +CFLAGS += -Wall -Wextra -Wformat -Wno-ignored-qualifiers -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) OBJS= \ @@ -85,6 +84,8 @@ OBJS= \ obj/main.o \ obj/miner.o \ obj/net.o \ + obj/ntp.o \ + obj/stun.o \ obj/protocol.o \ obj/bitcoinrpc.o \ obj/rpcdump.o \ @@ -99,20 +100,7 @@ OBJS= \ obj/wallet.o \ obj/walletdb.o \ obj/noui.o \ - obj/pbkdf2.o \ - obj/kernel.o \ - obj/scrypt.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/kernel.o ifndef USE_UPNP override USE_UPNP = - @@ -147,13 +135,54 @@ else OBJS += obj/txdb-bdb.o endif +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 $(CFLAGS) -MMD -o $@ $< + +crypto/scrypt/asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp + $(CXX) -c $(CFLAGS) -MMD -o $@ $< + +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 $@ $< + +crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S + $(CXX) -c $(CFLAGS) -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 $(CFLAGS) -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 $(CFLAGS) -MMD -o $@ $< +endif +endif -test check: test_novacoin FORCE - ./test_novacoin # auto-generated dependencies: -include obj/*.P --include obj-test/*.P obj/build.h: FORCE /bin/sh ../share/genbuild.sh obj/build.h @@ -167,42 +196,26 @@ 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) - -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 $@ $< - novacoind: $(OBJS:obj/%=obj/%) $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) - -obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(CFLAGS) -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/%)) - $(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) $(TESTLIBS) - 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 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: