X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.linux-mingw;h=594cc99314aa970a8b2865bb4832c7c2deeab872;hb=9417ff30cae6ffffd1c4fc4f4b1a81551f04dbc5;hp=351ac5a359392a45c0a5d81e4dd8d9524e19c498;hpb=724c956f3d3ff511490113d6696d3674ab51876f;p=novacoin.git

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 351ac5a..594cc99 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -50,7 +50,7 @@ LIBS= \
  -l crypto \
  -Wl,-Bstatic -lpthread -Wl,-Bdynamic
 
-DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
+DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS
 DEBUGFLAGS=-g
 CFLAGS=-O2 -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 LDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -static-libgcc -static-libstdc++
@@ -103,9 +103,7 @@ OBJS= \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/kernel.o \
-    obj/pbkdf2.o \
-    obj/scrypt.o
+    obj/kernel.o
 
 all: novacoind.exe
 
@@ -125,20 +123,40 @@ OBJS += obj/txdb-bdb.o
 endif
 
 ifeq (${USE_ASM}, 1)
-OBJS += obj/scrypt-x86.o obj/scrypt-x86_64.o
+# Assembler implementation
+OBJS += scrypt-asm/obj/scrypt-arm.o scrypt-asm/obj/scrypt-x86.o scrypt-asm/obj/scrypt-x86_64.o scrypt-asm/obj/asm-wrapper.o
 
-obj/scrypt-x86.o: scrypt-x86.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+scrypt-asm/obj/scrypt-x86.o: scrypt-asm/scrypt-x86.S
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-obj/scrypt-x86_64.o: scrypt-x86_64.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-endif
+scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+scrypt-asm/obj/scrypt-arm.o: scrypt-asm/scrypt-arm.S
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+scrypt-asm/obj/asm-wrapper.o: scrypt-asm/asm-wrapper.cpp
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
+else
+ifeq  (${USE_SSE2}, 1)
+# Intrinsic implementation
+DEFS += -DUSE_SSE2
+OBJS += scrypt-intrin/obj/scrypt-sse2.o
+
+scrypt-intrin/obj/scrypt-sse2.o: scrypt-intrin/scrypt-sse2.cpp $(HEADERS)
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
+else
 ifneq (${USE_ASM}, 1)
+# Generic implementation
 OBJS += obj/scrypt-generic.o
 
-obj/scrypt-generic.o: scrypt-generic.c
-	$(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
+obj/scrypt-generic.o: scrypt-generic.cpp
+	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 endif
+endif
+endif
+
+
 
 obj/build.h: FORCE
 	/bin/sh ../share/genbuild.sh obj/build.h
@@ -153,8 +171,16 @@ novacoind.exe: $(OBJS:obj/%=obj/%)
 	$(STRIP) novacoind.exe
 
 clean:
-	-rm -f obj/*.o
 	-rm -f novacoind.exe
+	-rm -f obj/*.o
+	-rm -f obj/*.P
+	-rm -f obj/*.d
+	-rm -f scrypt-asm/obj/*.o
+	-rm -f scrypt-asm/obj/*.P
+	-rm -f scrypt-asm/obj/*.d
+	-rm -f scrypt-intrin/obj/*.o
+	-rm -f scrypt-intrin/obj/*.P
+	-rm -f scrypt-intrin/obj/*.d
 	-rm -f obj/build.h
 	cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..