From: CryptoManiac <CryptoManiac@users.noreply.github.com>
Date: Tue, 23 Dec 2014 23:03:48 +0000 (+0300)
Subject: Merge pull request #86 from fsb4000/translation
X-Git-Tag: nvc-v0.5.1~53
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=724c956f3d3ff511490113d6696d3674ab51876f;hp=-c;p=novacoin.git

Merge pull request #86 from fsb4000/translation

russian translation
---

724c956f3d3ff511490113d6696d3674ab51876f
diff --combined src/makefile.linux-mingw
index de46800,7bb7476..351ac5a
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@@ -11,13 -11,13 +11,13 @@@ STRIP:=$(TARGET_PLATFORM)-w64-mingw32-s
  
  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,11 -48,11 +48,11 @@@ 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
  DEBUGFLAGS=-g
 -CFLAGS=-O3 -msse2 -w -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 +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++
  
  ifndef USE_UPNP