X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.unix;h=2dddfa62537b218cc2486dd87b83cb1e3de9d575;hb=5af8418fee23af1be2065382dda14a97034fdf56;hp=9671135181dc63926ee939aa42a531fc866e9add;hpb=1f648f2df22c9cf9b21493c90cc9f81035b98164;p=novacoin.git diff --git a/src/makefile.unix b/src/makefile.unix index 9671135..2dddfa6 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -82,11 +82,7 @@ DEBUGFLAGS=-g ifeq (${ARCH}, i686) - EXT_OPTIONS=-msse2 -mssse3 -endif - -ifeq (${ARCH}, x86_64) - EXT_OPTIONS=-mssse3 + EXT_OPTIONS=-msse2 endif xOPT_LEVEL=-O2 @@ -110,6 +106,7 @@ OBJS= \ obj/netbase.o \ obj/addrman.o \ obj/crypter.o \ + obj/base58.o \ obj/key.o \ obj/db.o \ obj/init.o \ @@ -122,6 +119,7 @@ OBJS= \ obj/stun.o \ obj/protocol.o \ obj/bitcoinrpc.o \ + obj/rpccrypt.o \ obj/rpcdump.o \ obj/rpcnet.o \ obj/rpcmining.o \ @@ -135,7 +133,9 @@ OBJS= \ obj/walletdb.o \ obj/noui.o \ obj/kernel.o \ - obj/kernel_worker.o + obj/kernel_worker.o \ + obj/ecies.o \ + obj/cryptogram.o all: novacoind @@ -158,7 +158,6 @@ 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 $(xCXXFLAGS) -MMD -o $@ $< @@ -172,15 +171,6 @@ crypto/scrypt/asm/obj/scrypt-arm.o: crypto/scrypt/asm/scrypt-arm.S crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< -crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S - $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< - -crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S - $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< - -crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S - $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $< - DEFS += -DUSE_ASM else @@ -234,9 +224,6 @@ clean: -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: