makefile fixes

[novacoin.git] / src / makefile.mingw

diff --git a/src/makefile.mingw b/src/makefile.mingw
index 3fa7244..c2298c7 100644 (file)
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -126,12 +126,12 @@ endif
 ifdef USE_ASM
 # 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/sha2/asm/obj/copy_swap.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 $@ $<
 
-scrypt-asm/obj/scrypt-x86_64.o: crypto/scrypt/asm/scrypt-x86_64.S
+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
@@ -140,8 +140,14 @@ 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 $(CFLAGS) -MMD -o $@ $<
 
-crypto/sha2/asm/obj/copy_swap.o: crypto/sha2/asm/copy_swap.c
-       $(CC)  -c $(CFLAGS) -MMD -o $@ $<
+crypto/sha2/asm/obj/sha2-x86.o: crypto/sha2/asm/sha2-x86.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-x86_64.o: crypto/sha2/asm/sha2-x86_64.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+
+crypto/sha2/asm/obj/sha2-arm.o: crypto/sha2/asm/sha2-arm.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
 DEFS += -DUSE_ASM
 
@@ -172,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: