Fix MinGW makefiles to resolve scrypt module issues.

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index e11c66d..594cc99 100644 (file)
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -127,16 +127,16 @@ ifeq (${USE_ASM}, 1)
 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
 
 scrypt-asm/obj/scrypt-x86.o: scrypt-asm/scrypt-x86.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/scrypt-arm.o: scrypt-asm/scrypt-arm.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/asm-wrapper.o: scrypt-asm/asm-wrapper.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
 ifeq  (${USE_SSE2}, 1)
 # Intrinsic implementation
@@ -144,14 +144,14 @@ DEFS += -DUSE_SSE2
 OBJS += scrypt-intrin/obj/scrypt-sse2.o
 
 scrypt-intrin/obj/scrypt-sse2.o: scrypt-intrin/scrypt-sse2.cpp $(HEADERS)
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
 ifneq (${USE_ASM}, 1)
 # Generic implementation
 OBJS += obj/scrypt-generic.o
 
 obj/scrypt-generic.o: scrypt-generic.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 endif
 endif
 endif

diff --git a/src/makefile.mingw b/src/makefile.mingw
index 71b7cdf..e6f1ff2 100644 (file)
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -116,16 +116,16 @@ ifdef USE_ASM
 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
 
 scrypt-asm/obj/scrypt-x86.o: scrypt-asm/scrypt-x86.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/scrypt-arm.o: scrypt-asm/scrypt-arm.S
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 scrypt-asm/obj/asm-wrapper.o: scrypt-asm/asm-wrapper.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
 ifdef USE_SSE2
 # Intrinsic implementation
@@ -133,13 +133,13 @@ DEFS += -DUSE_SSE2
 OBJS += scrypt-intrin/obj/scrypt-sse2.o
 
 scrypt-intrin/obj/scrypt-sse2.o: scrypt-intrin/scrypt-sse2.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 else
 # Generic implementation
 OBJS += obj/scrypt-generic.o
 
 obj/scrypt-generic.o: scrypt-generic.cpp
-       $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 endif
 endif