X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.unix;h=2dddfa62537b218cc2486dd87b83cb1e3de9d575;hb=4a6759691d71bf2a7d2a0a9e4710f0887e66ab02;hp=191c4c926eca227ecb4dd6fb04b1b80e3650883a;hpb=f1cc3f2b7b56686389a1deeaf0c7868a019d840e;p=novacoin.git

diff --git a/src/makefile.unix b/src/makefile.unix
index 191c4c9..2dddfa6 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -6,7 +6,7 @@ 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
 
@@ -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 \
@@ -134,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
 
@@ -157,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 $@ $<
@@ -171,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
@@ -233,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: