Refactoring

По совету
https://bitcointalk.org/index.php?topic=704756.msg9523706#msg9523706
изменил проект, чтобы он использовал пути  Static конфигураций.
Так же исправил TABы на пробелы. И изменил параметры Visual Studio,
чтобы она при нажатии на tab вставляла пробелы. + добавил этот пункт в
гайд по MSVC.
**ВНИМАНИЕ: После внесения этих правок, нужно  собрать db-6.0.20 в
Static конфигурации(вместо обычных).
Смотрите пункт 2.2 в файле doc\building novacoind and novacoinqt under
Windows with MSVC.txt**

diff --git a/MSVC/mynovacoin/mynovacoin.vcxproj b/MSVC/mynovacoin/mynovacoin.vcxproj
index af81692..9c2aad2 100644 (file)
--- a/MSVC/mynovacoin/mynovacoin.vcxproj
+++ b/MSVC/mynovacoin/mynovacoin.vcxproj
@@ -98,8 +98,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\Debug;..\..\..\deps\db-6.0.20\build_windows\win32\Debug;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60d.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\Debug;..\..\..\Deps\db-6.0.20\build_windows\Win32\Static Debug;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60sd.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -118,8 +118,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\x64\Debug;..\..\..\Deps\db-6.0.20\build_windows\x64\Debug;..\..\..\Deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\openssl-1.0.1j\out64.dbg;$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60d.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\x64\Debug;..\..\..\Deps\db-6.0.20\build_windows\x64\Static Debug;..\..\..\Deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\openssl-1.0.1j\out64.dbg;$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60sd.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -136,8 +136,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\Release;..\..\..\deps\db-6.0.20\build_windows\win32\Release;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\deps\openssl-1.0.1j\out32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\Release;..\..\..\deps\db-6.0.20\build_windows\Win32\Static Release;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\deps\openssl-1.0.1j\out32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60s.lib;Shlwapi.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
@@ -154,8 +154,8 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\x64\Release;..\..\..\Deps\db-6.0.20\build_windows\x64\Release;..\..\..\Deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\openssl-1.0.1j\out64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\Deps\miniupnpc\msvc\x64\Release;..\..\..\Deps\db-6.0.20\build_windows\x64\Static Release;..\..\..\Deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\openssl-1.0.1j\out64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;miniupnpc.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;winspool.lib;ssleay32.lib;libeay32.lib;libdb60s.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>

diff --git a/MSVC/mynovacoinqt/mynovacoinqt.vcxproj b/MSVC/mynovacoinqt/mynovacoinqt.vcxproj
index 4bf618c..719d122 100644 (file)
--- a/MSVC/mynovacoinqt/mynovacoinqt.vcxproj
+++ b/MSVC/mynovacoinqt/mynovacoinqt.vcxproj
@@ -112,8 +112,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libcommon.lib;leveldb.lib;miniupnpc.lib;iphlpapi.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60d.lib;Shlwapi.lib;%(AdditionalDependencies);ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;qwindowsd.lib;Qt5PlatformSupportD.lib;qtaccessiblewidgetsd.lib;qgenericbearerd.lib;qnativewifibearerd.lib;qddsd.lib;qicnsd.lib;qicod.lib;qjp2d.lib;qmngd.lib;qsvgd.lib;qtgad.lib;qtiffd.lib;qwbmpd.lib;qwebpd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\debug;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\Deps\qrencode-win32\vc8\Debug;..\..\..\deps\db-6.0.20\build_windows\win32\Debug;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;..\..\..\deps\openssl-1.0.1j\out32;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\imageformats;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libcommon.lib;leveldb.lib;miniupnpc.lib;iphlpapi.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60sd.lib;Shlwapi.lib;%(AdditionalDependencies);ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;qwindowsd.lib;Qt5PlatformSupportD.lib;qtaccessiblewidgetsd.lib;qgenericbearerd.lib;qnativewifibearerd.lib;qddsd.lib;qicnsd.lib;qicod.lib;qjp2d.lib;qmngd.lib;qsvgd.lib;qtgad.lib;qtiffd.lib;qwbmpd.lib;qwebpd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\debug;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\Deps\qrencode-win32\vc8\Debug;..\..\..\Deps\db-6.0.20\build_windows\Win32\Static Debug;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;..\..\..\deps\openssl-1.0.1j\out32;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\imageformats;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>
       </AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
@@ -161,8 +161,8 @@ C:\MyProjects\Deps\qt-everywhere-opensource-src-5.3.2\qtbase\bin\lrelease C:\MyP
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libcommon.lib;leveldb.lib;miniupnpc.lib;iphlpapi.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60d.lib;Shlwapi.lib;%(AdditionalDependencies);ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;qwindowsd.lib;Qt5PlatformSupportD.lib;qtaccessiblewidgetsd.lib;qgenericbearerd.lib;qnativewifibearerd.lib;qddsd.lib;qicnsd.lib;qicod.lib;qjp2d.lib;qmngd.lib;qsvgd.lib;qtgad.lib;qtiffd.lib;qwbmpd.lib;qwebpd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\x64\debug;..\..\..\deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\qrencode-win32\vc8\x64\Debug;..\..\..\deps\db-6.0.20\build_windows\x64\Debug;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out64.dbg;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\imageformats;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libcommon.lib;leveldb.lib;miniupnpc.lib;iphlpapi.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60sd.lib;Shlwapi.lib;%(AdditionalDependencies);ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;qwindowsd.lib;Qt5PlatformSupportD.lib;qtaccessiblewidgetsd.lib;qgenericbearerd.lib;qnativewifibearerd.lib;qddsd.lib;qicnsd.lib;qicod.lib;qjp2d.lib;qmngd.lib;qsvgd.lib;qtgad.lib;qtiffd.lib;qwbmpd.lib;qwebpd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\deps\miniupnpc\msvc\x64\debug;..\..\..\deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\qrencode-win32\vc8\x64\Debug;..\..\..\Deps\db-6.0.20\build_windows\x64\Static Debug;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out64.dbg;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\imageformats;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>
       </AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
@@ -211,8 +211,8 @@ C:\MyProjects\Deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\bin\lrelease C:\
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>miniupnpc.lib;iphlpapi.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60.lib;Shlwapi.lib;%(AdditionalDependencies);ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;qwindows.lib;Qt5PlatformSupport.lib;qtaccessiblewidgets.lib;qgenericbearer.lib;qnativewifibearer.lib;qdds.lib;qicns.lib;qico.lib;qjp2.lib;qmng.lib;qsvg.lib;qtga.lib;qtiff.lib;qwbmp.lib;qwebp.lib;libcommon.lib;leveldb.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;..\..\..\deps\openssl-1.0.1j\out32;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\imageformats;..\..\..\deps\miniupnpc\msvc\release\;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\Deps\qrencode-win32\vc8\Release\;..\..\..\deps\db-6.0.20\build_windows\win32\release\;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>miniupnpc.lib;iphlpapi.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60s.lib;Shlwapi.lib;%(AdditionalDependencies);ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;qwindows.lib;Qt5PlatformSupport.lib;qtaccessiblewidgets.lib;qgenericbearer.lib;qnativewifibearer.lib;qdds.lib;qicns.lib;qico.lib;qjp2.lib;qmng.lib;qsvg.lib;qtga.lib;qtiff.lib;qwbmp.lib;qwebp.lib;libcommon.lib;leveldb.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out32.dbg;..\..\..\deps\openssl-1.0.1j\out32;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2\qtbase\plugins\imageformats;..\..\..\deps\miniupnpc\msvc\release\;..\..\..\deps\boost_1_55_0\stage\lib;..\..\..\Deps\qrencode-win32\vc8\Release\;..\..\..\Deps\db-6.0.20\build_windows\Win32\Static Release;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,8 +258,8 @@ C:\MyProjects\Deps\qt-everywhere-opensource-src-5.3.2\qtbase\bin\lrelease C:\MyP
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>miniupnpc.lib;iphlpapi.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60.lib;Shlwapi.lib;%(AdditionalDependencies);ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;qwindows.lib;Qt5PlatformSupport.lib;qtaccessiblewidgets.lib;qgenericbearer.lib;qnativewifibearer.lib;qdds.lib;qicns.lib;qico.lib;qjp2.lib;qmng.lib;qsvg.lib;qtga.lib;qtiff.lib;qwbmp.lib;qwebp.lib;libcommon.lib;leveldb.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out64.dbg;..\..\..\deps\openssl-1.0.1j\out64;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\imageformats;..\..\..\deps\miniupnpc\msvc\x64\release\;..\..\..\deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\qrencode-win32\vc8\x64\Release\;..\..\..\deps\db-6.0.20\build_windows\x64\release\;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>miniupnpc.lib;iphlpapi.lib;kernel32.lib;user32.lib;shell32.lib;uuid.lib;ssleay32.lib;libeay32.lib;lib-qrcode.lib;libdb60s.lib;Shlwapi.lib;%(AdditionalDependencies);ole32.lib;advapi32.lib;ws2_32.lib;gdi32.lib;comdlg32.lib;oleaut32.lib;imm32.lib;winmm.lib;qtmain.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;qwindows.lib;Qt5PlatformSupport.lib;qtaccessiblewidgets.lib;qgenericbearer.lib;qnativewifibearer.lib;qdds.lib;qicns.lib;qico.lib;qjp2.lib;qmng.lib;qsvg.lib;qtga.lib;qtiff.lib;qwbmp.lib;qwebp.lib;libcommon.lib;leveldb.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\lib;..\..\..\deps\openssl-1.0.1j\out64.dbg;..\..\..\deps\openssl-1.0.1j\out64;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\accessible;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\bearer;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\platforms;..\..\..\deps\qt-everywhere-opensource-src-5.3.2-64\qtbase\plugins\imageformats;..\..\..\deps\miniupnpc\msvc\x64\release\;..\..\..\deps\boost_1_55_0\stage\lib\x64;..\..\..\Deps\qrencode-win32\vc8\x64\Release\;..\..\..\Deps\db-6.0.20\build_windows\x64\Static Release;$(SolutionDir)$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>false</GenerateDebugInformation>

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 5c9a1af..2089a7c 100644 (file)
--- a/doc/building novacoind and novacoinqt under Windows with MSVC.txt
+++ b/doc/building novacoind and novacoinqt under Windows with MSVC.txt
@@ -37,18 +37,16 @@ buildopenssl.bat
 -Запустите Visual Studio 2012
 -Откройте C:\MyProjects\Deps\db-6.0.20\build_windows\Berkeley_DB_vs2010.sln
 -Выберете проект db
--Перейдите в Свойства -> C/C++ -> Создание кода
--Измените в конфигурации Debug "Многопоточная отладка DLL" на "Многопоточную отладка"
--Измените в конфигурации Release "Многопоточный DLL" на "Многопоточный"
--Конфигурации измените и для 32 bit и для 64 bit (если вам нужно 64 bit)
+-Измените конфигурацию с Debug на Static Debug
 -Нажмите левой кнопкой мыши на  проект db, затем "Только проект" -> "Построить только db"
--Постройте так все конфигурации(Debug 32 bit, Release 32 bit, Debug X64, Release X64)
+-Постройте так все Static конфигурации(Static Debug 32 bit, Static Release 32 bit, Static Debug X64, Static Release X64)
 
-Проверка если вы всё сделали правильно то у вас будут файлы:
-C:\MyProjects\Deps\db-6.0.20\build_windows\Win32\Release\libdb60.lib
-C:\MyProjects\Deps\db-6.0.20\build_windows\Win32\Debug\libdb60d.lib
-C:\MyProjects\Deps\db-6.0.20\build_windows\x64\Release\libdb60.lib
-C:\MyProjects\Deps\db-6.0.20\build_windows\x64\Debug\libdb60d.lib
+Проверка:
+Если вы всё сделали правильно то у вас будут файлы:
+C:\MyProjects\Deps\db-6.0.20\build_windows\Win32\Static Release\libdb60s.lib
+C:\MyProjects\Deps\db-6.0.20\build_windows\Win32\Static Debug\libdb60sd.lib
+C:\MyProjects\Deps\db-6.0.20\build_windows\x64\Static Release\libdb60s.lib
+C:\MyProjects\Deps\db-6.0.20\build_windows\x64\Static Debug\libdb60sd.lib
 
 2.3 Boost
 -Скачайте http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.7z/download
@@ -94,6 +92,11 @@ buildqt64.bat
 3. Компиляция
 Будем хранить исходники в папке C:\MyProjects
 
+3.0 Подготовка Microsoft Visual Studio 2012 к работе
+-Откройте Microsoft Visual Studio 2012
+-Нажмите СЕРВИС -> Параметры.. -> Текстовый редактор -> Все языки -> Табуляция и поставьте флажок "Вставлять пробелы"
+(Если у вас английская версия, то это выглядит так: Tools->Options->Text Editor->All Languages->Tabs и поставьте флажок "Insert Spaces" вместо "Keep Tabs".)
+
 3.1 Скачиваем исходники
 -Зайдите на сайт https://github.com/novacoin-project/novacoin 
 -Нажмите Download ZIP

diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index c5a35b9..c69ad82 100644 (file)
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -21,7 +21,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
     mapper(0),
     fRestartWarningDisplayed_Proxy(false),
     fRestartWarningDisplayed_Lang(false),
-       fRestartWarningDisplayed_URL(false),
+    fRestartWarningDisplayed_URL(false),
     fProxyIpValid(true)
 {
     ui->setupUi(this);
@@ -125,7 +125,7 @@ void OptionsDialog::setModel(OptionsModel *model)
 
     /* warn only when language selection changes by user action (placed here so init via mapper doesn't trigger this) */
     connect(ui->lang, SIGNAL(valueChanged()), this, SLOT(showRestartWarning_Lang()));
-       connect(ui->thirdPartyTxUrls, SIGNAL(textChanged(const QString &)), this, SLOT(showRestartWarning_URL()));
+    connect(ui->thirdPartyTxUrls, SIGNAL(textChanged(const QString &)), this, SLOT(showRestartWarning_URL()));
 
     /* disable apply button after settings are loaded as there is nothing to save */
     disableApplyButton();
@@ -157,7 +157,7 @@ void OptionsDialog::setMapper()
     mapper->addMapping(ui->unit, OptionsModel::DisplayUnit);
     mapper->addMapping(ui->displayAddresses, OptionsModel::DisplayAddresses);
     mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
-       mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls);
+    mapper->addMapping(ui->thirdPartyTxUrls, OptionsModel::ThirdPartyTxUrls);
 }
 
 void OptionsDialog::enableApplyButton()

diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h
index 75183ca..5d75e06 100644 (file)
--- a/src/qt/optionsdialog.h
+++ b/src/qt/optionsdialog.h
@@ -42,7 +42,7 @@ private slots:
 
     void showRestartWarning_Proxy();
     void showRestartWarning_Lang();
-       void showRestartWarning_URL();
+    void showRestartWarning_URL();
     void updateDisplayUnit();
     void handleProxyIpValid(QValidatedLineEdit *object, bool fState);
 
@@ -55,7 +55,7 @@ private:
     MonitoredDataMapper *mapper;
     bool fRestartWarningDisplayed_Proxy;
     bool fRestartWarningDisplayed_Lang;
-       bool fRestartWarningDisplayed_URL;
+    bool fRestartWarningDisplayed_URL;
     bool fProxyIpValid;
 };
 

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1d86cd1..85cab8f 100644 (file)
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -43,7 +43,7 @@ void OptionsModel::Init()
     // These are Qt-only settings:
     nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt();
     bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
-       if (!settings.contains("strThirdPartyTxUrls"))
+    if (!settings.contains("strThirdPartyTxUrls"))
         settings.setValue("strThirdPartyTxUrls", "");
     strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s").toString();
     fMinimizeToTray = settings.value("fMinimizeToTray", false).toBool();
@@ -170,7 +170,7 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
             return QVariant(nDisplayUnit);
         case DisplayAddresses:
             return QVariant(bDisplayAddresses);
-           case ThirdPartyTxUrls:
+        case ThirdPartyTxUrls:
             return QVariant(strThirdPartyTxUrls);
         case DetachDatabases:
             return QVariant(bitdb.GetDetach());

diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index d87512d..e3f73b2 100644 (file)
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -51,7 +51,7 @@ public:
     int getDisplayUnit();
     bool getDisplayAddresses();
     bool getCoinControlFeatures();
-       QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; }
+    QString getThirdPartyTxUrls() { return strThirdPartyTxUrls; }
     QString getLanguage() { return language; }
 
 private:
@@ -61,7 +61,7 @@ private:
     bool fMinimizeOnClose;
     bool fCoinControlFeatures;
     QString language;
-       QString strThirdPartyTxUrls;
+    QString strThirdPartyTxUrls;
 
 signals:
     void displayUnitChanged(int unit);

diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp
index 3f6f38e..21eb1c7 100644 (file)
--- a/src/qt/transactionview.cpp
+++ b/src/qt/transactionview.cpp
@@ -141,10 +141,10 @@ TransactionView::TransactionView(QWidget *parent) :
     contextMenu->addAction(editLabelAction);
     contextMenu->addAction(showDetailsAction);
 
-       mapperThirdPartyTxUrls = new QSignalMapper(this);
+    mapperThirdPartyTxUrls = new QSignalMapper(this);
 
     // Connect actions
-       connect(mapperThirdPartyTxUrls, SIGNAL(mapped(QString)), this, SLOT(openThirdPartyTxUrl(QString)));
+    connect(mapperThirdPartyTxUrls, SIGNAL(mapped(QString)), this, SLOT(openThirdPartyTxUrl(QString)));
 
     connect(dateWidget, SIGNAL(activated(int)), this, SLOT(chooseDate(int)));
     connect(typeWidget, SIGNAL(activated(int)), this, SLOT(chooseType(int)));
@@ -199,7 +199,7 @@ void TransactionView::setModel(WalletModel *model)
         transactionView->horizontalHeader()->resizeSection(
                 TransactionTableModel::Amount, 100);
 
-               if (model->getOptionsModel())
+        if (model->getOptionsModel())
         {
             // Add third party transaction URLs to context menu
             QStringList listUrls = model->getOptionsModel()->getThirdPartyTxUrls().split("|", QString::SkipEmptyParts);

diff --git a/src/qt/transactionview.h b/src/qt/transactionview.h
index 2b42d6c..e746c63 100644 (file)
--- a/src/qt/transactionview.h
+++ b/src/qt/transactionview.h
@@ -51,7 +51,7 @@ private:
     QLineEdit *amountWidget;
 
     QMenu *contextMenu;
-       QSignalMapper *mapperThirdPartyTxUrls;
+    QSignalMapper *mapperThirdPartyTxUrls;
 
     QFrame *dateRangeWidget;
     QDateTimeEdit *dateFrom;
@@ -68,7 +68,7 @@ private slots:
     void copyLabel();
     void copyAmount();
     void copyTxID();
-       void openThirdPartyTxUrl(QString url);
+    void openThirdPartyTxUrl(QString url);
 
 signals:
     void doubleClicked(const QModelIndex&);