Merge pull request #65 from CherryPill/v1.4

V1.4

.gitignore

@@ -9,4 +9,10 @@ bld/
 [Oo]bj/
 [Ll]og/
 *.VC.db
-*.VC.VC.opendb
+*.VC.VC.opendb
+**/*.sdf 
+packages/
+*.vcxproj
+*.vcxproj.filters
+*.suo
+.vs/

SystemInfo.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SystemInfo", "SystemInfo\SystemInfo.vcxproj", "{48DC8C62-89CF-4F86-BFE0-42AA4080A9B8}"
 EndProject

SystemInfo/SystemInfo.manifest

@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
     version="1.0.0.0"
-    processorArchitecture="amd64"
+    processorArchitecture="x86"
     name="SystemInfo"
     type="win32"
 />
@@ -13,7 +13,7 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="amd64"
+            processorArchitecture="x86"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />

SystemInfo/SystemInfo.vcxproj

@@ -34,8 +34,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -90,12 +90,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>W:\boost\boost_1_64_0\stage\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>W:\Projects\SI\v1.4\packages\curl-vc141-dynamic-x86_64.7.59.0\build\native\lib\Win32\dynamic;W:\Projects\SI\v1.4\packages\curl-vc141-dynamic-x86_64.7.59.0\build\native\lib\Win32\static;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;gdiplus.lib;wbemuuid.lib;powrprof.lib;IPHLPAPI.lib;wininet.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,13 +123,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;gdiplus.lib;wbemuuid.lib;powrprof.lib;IPHLPAPI.lib;wininet.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -150,56 +153,49 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="aboutDialog.cpp" />
-    <ClCompile Include="binImport.cpp" />
-    <ClCompile Include="globalVars.cpp" />
+    <ClCompile Include="core\sysinfo.cpp" />
+    <ClCompile Include="core\SystemInfo.cpp" />
+    <ClCompile Include="dialog\aboutDialog.cpp" />
+    <ClCompile Include="dialog\scrUploadDialog.cpp" />
+    <ClCompile Include="export\saveSpecs.cpp" />
+    <ClCompile Include="export\screenCapture.cpp" />
+    <ClCompile Include="glb\globalVars.cpp" />
+    <ClCompile Include="import\binImport.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="mainWindowProcedure.cpp" />
-    <ClCompile Include="network.cpp" />
-    <ClCompile Include="pugixml.cpp" />
-    <ClCompile Include="saveSpecs.cpp" />
-    <ClCompile Include="screenCapture.cpp" />
+    <ClCompile Include="meta\SoftwareInfo.cpp" />
+    <ClCompile Include="network\common\network.cpp" />
+    <ClCompile Include="network\rest\rest.cpp" />
+    <ClCompile Include="pugi\pugixml.cpp" />
     <ClCompile Include="SMBIOS.cpp" />
-    <ClCompile Include="SoftwareInfo.cpp" />
-    <ClCompile Include="sysinfo.cpp" />
-    <ClCompile Include="SystemInfo.cpp" />
-    <ClCompile Include="utility.cpp" />
+    <ClCompile Include="util\utility.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="aboutDialog.h" />
-    <ClInclude Include="appconst.h" />
-    <ClInclude Include="binImport.h" />
-    <ClInclude Include="globalVars.h" />
-    <ClInclude Include="iconLabelIDs.h" />
-    <ClInclude Include="itemIDs.h" />
+    <ClInclude Include="const\appconst.h" />
+    <ClInclude Include="const\iconLabelIDs.h" />
+    <ClInclude Include="const\itemIDs.h" />
+    <ClInclude Include="core\sysinfo.h" />
+    <ClInclude Include="core\SystemInfo.h" />
+    <ClInclude Include="dialog\aboutDialog.h" />
+    <ClInclude Include="dialog\scrUploadDialog.h" />
+    <ClInclude Include="export\saveSpecs.h" />
+    <ClInclude Include="export\screenCapture.h" />
+    <ClInclude Include="glb\globalVars.h" />
+    <ClInclude Include="import\binImport.h" />
     <ClInclude Include="mainWindowProcedure.h" />
-    <ClInclude Include="network.h" />
-    <ClInclude Include="pugiconfig.hpp" />
-    <ClInclude Include="pugixml.hpp" />
+    <ClInclude Include="meta\SoftwareInfo.h" />
+    <ClInclude Include="network\common\network.h" />
+    <ClInclude Include="network\rest\rest.h" />
+    <ClInclude Include="pugi\pugiconfig.hpp" />
+    <ClInclude Include="pugi\pugixml.hpp" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="saveSpecs.h" />
-    <ClInclude Include="screenCapture.h" />
     <ClInclude Include="SMBIOS.h" />
-    <ClInclude Include="SoftwareInfo.h" />
-    <ClInclude Include="sysinfo.h" />
-    <ClInclude Include="SystemInfo.h" />
-    <ClInclude Include="utility.h" />
+    <ClInclude Include="util\utility.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="SystemInfo.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\cpu.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\GPU.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\mainIcon.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\mb.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\monitor.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\optical.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\os.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\RAM.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\sound.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\storage.ico" />
-    <Image Include="C:\Users\Theta1\Desktop\speccy]\uptime.ico" />
     <Image Include="Icons\bios.ico" />
     <Image Include="Icons\cpu.ico" />
     <Image Include="Icons\GPU.ico" />