X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.mingw;h=c2298c78b91660c1a49ccf9e12761cf9801968a8;hb=1663f4a94dbb36331d2930c89eb51c0213200236;hp=c09ed6beb4300d0a044a38d462416e299b337a44;hpb=71bb258543e2a50555397336a0d1ad8f1fccfc4c;p=novacoin.git

diff --git a/src/makefile.mingw b/src/makefile.mingw
index c09ed6b..c2298c7 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -43,6 +43,12 @@ ifeq (${USE_O3}, 1)
     xOPT_LEVEL=-O3
 endif
 
+ifdef  USE_SSSE3
+# Intrinsic implementation of block copy
+DEFS += -DUSE_SSSE3
+xOPT_LEVEL+=-mssse3
+endif
+
 DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 DEBUGFLAGS=-g
 CFLAGS=-mthreads $(xOPT_LEVEL) -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
@@ -119,32 +125,45 @@ endif
 
 ifdef USE_ASM
 # 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
+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 $@ $<
 
-scrypt-asm/obj/scrypt-x86.o: scrypt-asm/scrypt-x86.S
+crypto/scrypt/asm/obj/asm-wrapper.o: crypto/scrypt/asm/asm-wrapper.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/scrypt-arm.o: scrypt-asm/scrypt-arm.S
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-scrypt-asm/obj/asm-wrapper.o: scrypt-asm/asm-wrapper.cpp
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+DEFS += -DUSE_ASM
+
 else
 ifdef USE_SSE2
 # Intrinsic implementation
 DEFS += -DUSE_SSE2
 OBJS += scrypt-intrin/obj/scrypt-sse2.o
 
-scrypt-intrin/obj/scrypt-sse2.o: scrypt-intrin/scrypt-sse2.cpp
+crypto/scrypt/intrin/obj/scrypt-sse2.o: crypto/scrypt/intrin/scrypt-sse2.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
 # Generic implementation
 OBJS += obj/scrypt-generic.o
 
-obj/scrypt-generic.o: scrypt-generic.cpp
+crypto/scrypt/obj/scrypt-generic.o: crypto/scrypt/generic/scrypt-generic.cpp
 	$(CXX) -c $(CFLAGS) -MMD -o $@ $<
 endif
 endif
@@ -159,5 +178,7 @@ novacoind.exe: $(OBJS:obj/%=obj/%)
 clean:
 	-del /Q novacoind
 	-del /Q obj\*
+        -del /Q crypto\scrypt\asm\obj\*
+        -del /Q crypto\sha2\asm\obj\*
 
 FORCE: