From: CryptoManiac <CryptoManiac@users.noreply.github.com>
Date: Thu, 18 Dec 2014 19:47:30 +0000 (+0300)
Subject: Merge pull request #81 from fsb4000/patch-1
X-Git-Tag: nvc-v0.5.1~69
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=539a44c96ff65959b2e068c2780d22c5a6061f57;hp=20be85e9b6bb6891113d09ab56d2f1db2d87474a;p=novacoin.git

Merge pull request #81 from fsb4000/patch-1

Возврат версии Berkley DB к 6.0.20
---

diff --git a/doc/building novacoind and novacoinqt under Windows with MinGW.txt b/doc/building novacoind and novacoinqt under Windows with MinGW.txt
index a7ae17a..0268b96 100644
--- a/doc/building novacoind and novacoinqt under Windows with MinGW.txt	
+++ b/doc/building novacoind and novacoinqt under Windows with MinGW.txt	
@@ -50,12 +50,12 @@ Configure no-shared no-dso mingw
 make
 
 2.2 Berkeley DB
--Скачайте http://download.oracle.com/berkeley-db/db-6.1.19.tar.gz
+-Скачайте http://download.oracle.com/berkeley-db/db-6.0.20.tar.gz
 -Из MinGw shell выполните следующий код:
 
 cd /c/deps/
-tar xvfz db-6.1.19.tar.gz
-cd db-6.1.19/build_unix
+tar xvfz db-6.0.20.tar.gz
+cd db-6.0.20/build_unix
 ../dist/configure --enable-mingw --enable-cxx --disable-shared --disable-replication
 make
 
@@ -168,14 +168,14 @@ INCLUDEPATHS= \
  -I"$(CURDIR)" \
  -I"/c/deps/boost_1_57_0" \
  -I"/c/deps" \
- -I"/c/deps/db-6.1.19/build_unix" \
+ -I"/c/deps/db-6.0.20/build_unix" \
  -I"/c/deps/openssl-1.0.1j/include"
  
 LIBPATHS= \
  -L"$(CURDIR)/leveldb" \
  -L"/c/deps/boost_1_57_0/stage/lib" \
  -L"/c/deps/miniupnpc" \
- -L"/c/deps/db-6.1.19/build_unix" \
+ -L"/c/deps/db-6.0.20/build_unix" \
  -L"/c/deps/openssl-1.0.1j"
 
 LIBS= \
@@ -247,8 +247,8 @@ TARGET_OS=NATIVE_WINDOWS make libleveldb.a libmemenv.a
 BOOST_LIB_SUFFIX=-mgw49-mt-s-1_57
 BOOST_INCLUDE_PATH=C:/deps/boost_1_57_0
 BOOST_LIB_PATH=C:/deps/boost_1_57_0/stage/lib
-BDB_INCLUDE_PATH=C:/deps/db-6.1.19/build_unix
-BDB_LIB_PATH=C:/deps/db-6.1.19/build_unix
+BDB_INCLUDE_PATH=C:/deps/db-6.0.20/build_unix
+BDB_LIB_PATH=C:/deps/db-6.0.20/build_unix
 OPENSSL_INCLUDE_PATH=C:/deps/openssl-1.0.1j/include
 OPENSSL_LIB_PATH=C:/deps/openssl-1.0.1j
 MINIUPNPC_INCLUDE_PATH=C:/deps/
@@ -490,4 +490,4 @@ cd C:\MyProjects\novacoin-master
 qmake "USE_QRCODE=1" "USE_UPNP=1" "USE_IPV6=1" "USE_LEVELDB=1" "USE_ASM=1" novacoin-qt64.pro
 mingw32-make -f Makefile.Release
 
-Если всё сделано правильно, то файл novacoin-qt.exe будет находится в папке C:\MyProjects\novacoin-master\release
\ No newline at end of file
+Если всё сделано правильно, то файл novacoin-qt.exe будет находится в папке C:\MyProjects\novacoin-master\release