Revert "выбор папки для базы блоков из GUI"

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

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 351ac5a..e71d542 100644 (file)
--- 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++
@@ -104,7 +104,6 @@ OBJS= \
     obj/walletdb.o \
     obj/noui.o \
     obj/kernel.o \
-    obj/pbkdf2.o \
     obj/scrypt.o
 
 all: novacoind.exe
@@ -133,12 +132,22 @@ obj/scrypt-x86.o: scrypt-x86.S
 obj/scrypt-x86_64.o: scrypt-x86_64.S
        $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
 endif
+
 ifneq (${USE_ASM}, 1)
 OBJS += obj/scrypt-generic.o
 
 obj/scrypt-generic.o: scrypt-generic.c
        $(CC) -c $(xCXXFLAGS) -MMD -o $@ $<
+
+ifeq  (${USE_SSE2}, 1)
+DEFS += -DUSE_SSE2
+OBJS += obj/scrypt-sse2.o
+
+obj/scrypt-sse2.o: scrypt-sse2.cpp $(HEADERS)
+       $(CCX)  -c $(CFLAGS) -MMD -o $@ $<
 endif
+endif
+
 
 obj/build.h: FORCE
        /bin/sh ../share/genbuild.sh obj/build.h