Add examples.

[novacoin.git] / src / makefile.linux-mingw

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 26a8eb8..48aa95f 100644 (file)
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -88,6 +88,7 @@ OBJS= \
     obj/main.o \
     obj/miner.o \
     obj/net.o \
+    obj/ntp.o \
     obj/stun.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
@@ -103,9 +104,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,31 +124,41 @@ 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
-
-ifneq (${USE_ASM}, 1)
-OBJS += obj/scrypt-generic.o
+scrypt-asm/obj/scrypt-x86_64.o: scrypt-asm/scrypt-x86_64.S
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
 
-obj/scrypt-generic.o: scrypt-generic.c
-       $(CC) -c $(xCXXFLAGS) -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 += obj/scrypt-sse2.o
+OBJS += scrypt-intrin/obj/scrypt-sse2.o
 
-obj/scrypt-sse2.o: scrypt-sse2.cpp $(HEADERS)
-       $(CCX)  -c $(CFLAGS) -MMD -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.cpp
+       $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+endif
 endif
 endif
 
 
+
 obj/build.h: FORCE
        /bin/sh ../share/genbuild.sh obj/build.h
 version.cpp: obj/build.h
@@ -163,8 +172,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 ..