X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.unix;h=2dddfa62537b218cc2486dd87b83cb1e3de9d575;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=34ed1a39c8c9e2b1d3294bc2d8c93a6145818723;hpb=2e8cbdc74596f09c70049966a4686c2a1507f200;p=novacoin.git

diff --git a/src/makefile.unix b/src/makefile.unix
index 34ed1a3..2dddfa6 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -2,12 +2,11 @@
 # 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
 
 LINK:=$(CXX)
-ARCH:=$(system lscpu | head -n 1 | awk '{print $2}')
+ARCH:=$(shell uname -m)
 
 DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 
@@ -34,14 +33,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
@@ -99,12 +90,6 @@ ifeq (${USE_O3}, 1)
     xOPT_LEVEL=-O3
 endif
 
-ifeq  (${USE_SSSE3}, 1)
-# Intrinsic implementation of block copy
-DEFS += -DUSE_SSSE3
-xOPT_LEVEL += -mssse3
-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=$(xOPT_LEVEL) $(EXT_OPTIONS) -pthread -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter \
@@ -121,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 \
@@ -133,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 \
@@ -145,7 +132,10 @@ OBJS= \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/kernel.o
+    obj/kernel.o \
+    obj/kernel_worker.o \
+    obj/ecies.o \
+    obj/cryptogram.o
 
 all: novacoind
 
@@ -168,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 $@ $<
@@ -182,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
@@ -244,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: