From: svost <ya.nowa@yandex.ru>
Date: Thu, 19 Feb 2015 14:06:35 +0000 (+0300)
Subject: Small-sized corrections in assembly with msvc
X-Git-Tag: nvc-v0.5.3~54^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=6052a60ad11f232f26e74ff8f4cbc409dd9064c4

Small-sized corrections in assembly with msvc
---

diff --git a/MSVC/build-helpers/buildqt32.bat b/MSVC/build-helpers/buildqt32.bat
index 96e3572..32ae090 100644
--- a/MSVC/build-helpers/buildqt32.bat
+++ b/MSVC/build-helpers/buildqt32.bat
@@ -8,7 +8,7 @@ perl -pi.bak -e "s#QMAKE_CFLAGS_RELEASE    = -O2 -MD#QMAKE_CFLAGS_RELEASE    = -
 perl -pi.bak -e "s#QMAKE_CFLAGS_DEBUG      = -Zi -MDd#QMAKE_CFLAGS_DEBUG      = -Z7 -MTd#g;" qtbase\mkspecs\win32-msvc2012\qmake.conf
 REM Now do 32 bit by setting environment to MSVC 32 bit
 call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\vcvars32.bat"
-call configure -debug-and-release -openssl-linked -opensource -confirm-license -platform win32-msvc2012 -nomake examples -nomake tests -static -I \MyProjects\Deps\openssl-1.0.1j\inc32 -L \MyProjects\Deps\openssl-1.0.1j\out32.dbg -L \MyProjects\Deps\openssl-1.0.1j\out32 -l gdi32 -no-opengl -qt-zlib -qt-libpng -qt-libjpeg
+call configure -debug-and-release -openssl-linked -opensource -confirm-license -platform win32-msvc2012 -nomake examples -nomake tests -static -I \MyProjects\Deps\openssl-1.0.2\inc32 -L \MyProjects\Deps\openssl-1.0.2\out32.dbg -L \MyProjects\Deps\openssl-1.0.2\out32 -l gdi32 -no-opengl -qt-zlib -qt-libpng -qt-libjpeg
 nmake
 REM put back the path
 set PATH=%OLDPATH%
diff --git a/MSVC/build-helpers/buildqt64.bat b/MSVC/build-helpers/buildqt64.bat
index 3ef5c61..2cf14a9 100644
--- a/MSVC/build-helpers/buildqt64.bat
+++ b/MSVC/build-helpers/buildqt64.bat
@@ -8,7 +8,7 @@ perl -pi.bak -e "s#QMAKE_CFLAGS_RELEASE    = -O2 -MD#QMAKE_CFLAGS_RELEASE    = -
 perl -pi.bak -e "s#QMAKE_CFLAGS_DEBUG      = -Zi -MDd#QMAKE_CFLAGS_DEBUG      = -Z7 -MTd#g;" qtbase\mkspecs\win32-msvc2012\qmake.conf
 REM Now do 64 bit by setting environment to MSVC 64 bit
 call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86_amd64
-call configure -debug-and-release -openssl-linked -opensource -confirm-license -platform win32-msvc2012 -nomake examples -nomake tests -static -I \MyProjects\Deps\openssl-1.0.1j\inc32 -L \MyProjects\Deps\openssl-1.0.1j\out64.dbg -L \MyProjects\Deps\openssl-1.0.1j\out64 -l gdi32 -no-opengl -qt-zlib -qt-libpng -qt-libjpeg
+call configure -debug-and-release -openssl-linked -opensource -confirm-license -platform win32-msvc2012 -nomake examples -nomake tests -static -I \MyProjects\Deps\openssl-1.0.2\inc32 -L \MyProjects\Deps\openssl-1.0.2\out64.dbg -L \MyProjects\Deps\openssl-1.0.2\out64 -l gdi32 -no-opengl -qt-zlib -qt-libpng -qt-libjpeg
 nmake
 REM put back the path
 set PATH=%OLDPATH%
diff --git a/doc/building novacoind and novacoinqt under Windows with MSVC.txt b/doc/building novacoind and novacoinqt under Windows with MSVC.txt
index 32dd2d7..e5584ba 100644
--- a/doc/building novacoind and novacoinqt under Windows with MSVC.txt	
+++ b/doc/building novacoind and novacoinqt under Windows with MSVC.txt	
@@ -1,10 +1,13 @@
 1. Подготовка системы.
+Внимание: данная инструкция (включая сопутствуюшие файлы) расчитана на сборку в среде Windows 64-bit.
 
 1.1 Установка архиватора 7z: http://www.7-zip.org/ 
 (при написании инструкции использовался 7-Zip 9.20 64 bit X64, но скорее всего подойдёт любая версия)
 
 1.2 Установка Visual Studio 2012. (Подойдёт даже бесплатная версия)
 http://www.microsoft.com/ru-ru/download/details.aspx?id=34673
+Установить обновление Visual Studio 2012 Update 4
+http://www.microsoft.com/ru-ru/download/details.aspx?id=39305
 
 1.3 Установка Perl(при написании инструкции использовался ActivePerl-5.16.3.1604-MSWin32-x86-298023.msi)
 http://www.activestate.com/activeperl/downloads