Merge pull request #188 from fsb4000/android-x86

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

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index de46800..26a8eb8 100644 (file)
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -11,13 +11,13 @@ STRIP:=$(TARGET_PLATFORM)-w64-mingw32-strip
 
 DEPSDIR:=/usr/$(TARGET_PLATFORM)-w64-mingw32
 
-BOOST_LIB_PATH:=$(DEPSDIR)/boost_1_55_0/stage/lib
-BDB_LIB_PATH:=$(DEPSDIR)/db-6.0.20/build_unix
+BOOST_LIB_PATH:=$(DEPSDIR)/boost_1_57_0/stage/lib
+BDB_LIB_PATH:=$(DEPSDIR)/db-6.0.20.NC/build_unix
 MINIUPNPC_LIB_PATH:=$(DEPSDIR)/miniupnpc-1.9
 OPENSSL_LIB_PATH:=$(DEPSDIR)/openssl-1.0.1h
 
-BOOST_INCLUDE_PATH:=$(DEPSDIR)/boost_1_55_0
-BDB_INCLUDE_PATH:=$(DEPSDIR)/db-6.0.20/build_unix
+BOOST_INCLUDE_PATH:=$(DEPSDIR)/boost_1_57_0
+BDB_INCLUDE_PATH:=$(DEPSDIR)/db-6.0.20.NC/build_unix
 MINIUPNPC_INCLUDE_PATH:=$(DEPSDIR)
 OPENSSL_INCLUDE_PATH:=$(DEPSDIR)/openssl-1.0.1h/include
 
@@ -48,9 +48,9 @@ LIBS= \
  -l db_cxx \
  -l ssl \
  -l crypto \
- -lz
+ -Wl,-Bstatic -lpthread -Wl,-Bdynamic
 
-DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DBOOST_USE_WINDOWS_H
+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++
@@ -133,12 +133,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