• R/O
  • HTTP
  • SSH
  • HTTPS

MUtilities: 提交

MUtilities development repository


Commit MetaInfo

修订版4f16db680974df50555c1f246ad7b5b86bc92a4a (tree)
时间2015-08-07 03:49:50
作者LoRd_MuldeR <mulder2@gmx....>
CommiterLoRd_MuldeR

Log Message

Added project/solution files for VS2015 + some build fixes for VS2015.

更改概述

差异

--- a/MUtilities_VS2013.vcxproj
+++ b/MUtilities_VS2013.vcxproj
@@ -163,7 +163,7 @@
163163 <Link>
164164 <SubSystem>Windows</SubSystem>
165165 <GenerateDebugInformation>true</GenerateDebugInformation>
166- <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
166+ <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
167167 <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
168168 </Link>
169169 </ItemDefinitionGroup>
@@ -192,7 +192,7 @@
192192 <SubSystem>Windows</SubSystem>
193193 <EnableCOMDATFolding>true</EnableCOMDATFolding>
194194 <OptimizeReferences>true</OptimizeReferences>
195- <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
195+ <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
196196 <AdditionalDependencies>QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
197197 <GenerateDebugInformation>false</GenerateDebugInformation>
198198 </Link>
--- /dev/null
+++ b/MUtilities_VS2015.sln
@@ -0,0 +1,25 @@
1+
2+Microsoft Visual Studio Solution File, Format Version 12.00
3+# Visual Studio 2013
4+VisualStudioVersion = 12.0.31101.0
5+MinimumVisualStudioVersion = 10.0.40219.1
6+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilities_VS2015", "MUtilities_VS2015.vcxproj", "{55405FE1-149F-434C-9D72-4B64348D2A08}"
7+EndProject
8+Global
9+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+ Debug|Win32 = Debug|Win32
11+ Release_Static|Win32 = Release_Static|Win32
12+ Release|Win32 = Release|Win32
13+ EndGlobalSection
14+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Debug|Win32.ActiveCfg = Debug|Win32
16+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Debug|Win32.Build.0 = Debug|Win32
17+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Release_Static|Win32.ActiveCfg = Release_Static|Win32
18+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Release_Static|Win32.Build.0 = Release_Static|Win32
19+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.ActiveCfg = Release|Win32
20+ {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.Build.0 = Release|Win32
21+ EndGlobalSection
22+ GlobalSection(SolutionProperties) = preSolution
23+ HideSolutionNode = FALSE
24+ EndGlobalSection
25+EndGlobal
--- /dev/null
+++ b/MUtilities_VS2015.vcxproj
@@ -0,0 +1,231 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+ <ItemGroup Label="ProjectConfigurations">
4+ <ProjectConfiguration Include="Debug|Win32">
5+ <Configuration>Debug</Configuration>
6+ <Platform>Win32</Platform>
7+ </ProjectConfiguration>
8+ <ProjectConfiguration Include="Release_Static|Win32">
9+ <Configuration>Release_Static</Configuration>
10+ <Platform>Win32</Platform>
11+ </ProjectConfiguration>
12+ <ProjectConfiguration Include="Release|Win32">
13+ <Configuration>Release</Configuration>
14+ <Platform>Win32</Platform>
15+ </ProjectConfiguration>
16+ </ItemGroup>
17+ <ItemGroup>
18+ <ClCompile Include="$(SolutionDir)\tmp\$(ProjectName)\QRC_MUtilsData.cpp" />
19+ <ClCompile Include="$(SolutionDir)\tmp\$(ProjectName)\MOC_UpdateChecker.cpp" />
20+ <ClCompile Include="src\3rd_party\adler32\src\adler32.cpp" />
21+ <ClCompile Include="src\3rd_party\blake2\src\blake2.cpp" />
22+ <ClCompile Include="src\3rd_party\strnatcmp\src\strnatcmp.cpp" />
23+ <ClCompile Include="src\CPUFeatures_Win32.cpp" />
24+ <ClCompile Include="src\DLLMain.cpp" />
25+ <ClCompile Include="src\ErrorHandler_Win32.cpp" />
26+ <ClCompile Include="src\Global.cpp" />
27+ <ClCompile Include="src\GUI.cpp" />
28+ <ClCompile Include="src\GUI_Win32.cpp" />
29+ <ClCompile Include="src\Hash_Blake2.cpp" />
30+ <ClCompile Include="src\IPCChannel.cpp" />
31+ <ClCompile Include="src\JobObject_Win32.cpp" />
32+ <ClCompile Include="src\Hash_Keccak.cpp" />
33+ <ClCompile Include="src\OSSupport_Win32.cpp" />
34+ <ClCompile Include="src\Registry_Win32.cpp" />
35+ <ClCompile Include="src\Sound_Win32.cpp" />
36+ <ClCompile Include="src\Startup.cpp" />
37+ <ClCompile Include="src\Taskbar7_Win32.cpp" />
38+ <ClCompile Include="src\Terminal_Win32.cpp" />
39+ <ClCompile Include="src\Translation.cpp" />
40+ <ClCompile Include="src\UpdateChecker.cpp" />
41+ <ClCompile Include="src\Version.cpp" />
42+ </ItemGroup>
43+ <ItemGroup>
44+ <ClInclude Include="include\MUtils\CPUFeatures.h" />
45+ <ClInclude Include="include\MUtils\ErrorHandler.h" />
46+ <ClInclude Include="include\MUtils\Exception.h" />
47+ <ClInclude Include="include\MUtils\Global.h" />
48+ <ClInclude Include="include\MUtils\GUI.h" />
49+ <ClInclude Include="include\MUtils\Hash_Blake2.h" />
50+ <ClInclude Include="include\MUtils\IPCChannel.h" />
51+ <ClInclude Include="include\MUtils\JobObject.h" />
52+ <ClInclude Include="include\MUtils\Hash_Keccak.h" />
53+ <ClInclude Include="include\MUtils\OSSupport.h" />
54+ <ClInclude Include="include\MUtils\Registry.h" />
55+ <ClInclude Include="include\MUtils\Sound.h" />
56+ <ClInclude Include="include\MUtils\Startup.h" />
57+ <ClInclude Include="include\MUtils\Taskbar7.h" />
58+ <ClInclude Include="include\MUtils\Terminal.h" />
59+ <ClInclude Include="include\MUtils\Translation.h" />
60+ <ClInclude Include="src\3rd_party\adler32\include\adler32.h" />
61+ <ClInclude Include="src\3rd_party\blake2\include\blake2.h" />
62+ <ClInclude Include="src\3rd_party\keccak\include\keccak_impl.h" />
63+ <ClInclude Include="src\3rd_party\strnatcmp\include\strnatcmp.h" />
64+ <ClInclude Include="src\DirLocker.h" />
65+ <CustomBuild Include="include\Mutils\UpdateChecker.h">
66+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
67+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
68+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
69+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
70+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
71+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
72+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)"</Command>
73+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp"</Message>
74+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
75+ </CustomBuild>
76+ <ClInclude Include="include\MUtils\Version.h" />
77+ <ClInclude Include="src\CriticalSection_Win32.h" />
78+ </ItemGroup>
79+ <ItemGroup>
80+ <CustomBuild Include="res\MUtilsData.qrc">
81+ <FileType>Document</FileType>
82+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
83+ <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
84+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
85+ <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
86+ <Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
87+ <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp"</Message>
88+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
89+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
90+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs)</Outputs>
91+ </CustomBuild>
92+ </ItemGroup>
93+ <PropertyGroup Label="Globals">
94+ <ProjectGuid>{55405FE1-149F-434C-9D72-4B64348D2A08}</ProjectGuid>
95+ <Keyword>Win32Proj</Keyword>
96+ <RootNamespace>MUtilities</RootNamespace>
97+ <ProjectName>MUtilities</ProjectName>
98+ </PropertyGroup>
99+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
100+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
101+ <ConfigurationType>DynamicLibrary</ConfigurationType>
102+ <UseDebugLibraries>true</UseDebugLibraries>
103+ <PlatformToolset>v140_xp</PlatformToolset>
104+ <CharacterSet>Unicode</CharacterSet>
105+ </PropertyGroup>
106+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
107+ <ConfigurationType>DynamicLibrary</ConfigurationType>
108+ <UseDebugLibraries>false</UseDebugLibraries>
109+ <PlatformToolset>v140_xp</PlatformToolset>
110+ <WholeProgramOptimization>true</WholeProgramOptimization>
111+ <CharacterSet>Unicode</CharacterSet>
112+ </PropertyGroup>
113+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'" Label="Configuration">
114+ <ConfigurationType>StaticLibrary</ConfigurationType>
115+ <UseDebugLibraries>false</UseDebugLibraries>
116+ <PlatformToolset>v140_xp</PlatformToolset>
117+ <WholeProgramOptimization>true</WholeProgramOptimization>
118+ <CharacterSet>Unicode</CharacterSet>
119+ </PropertyGroup>
120+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
121+ <ImportGroup Label="ExtensionSettings">
122+ </ImportGroup>
123+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
124+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
125+ </ImportGroup>
126+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
127+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
128+ </ImportGroup>
129+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'" Label="PropertySheets">
130+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
131+ </ImportGroup>
132+ <PropertyGroup Label="UserMacros" />
133+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
134+ <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
135+ <IntDir>$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
136+ <TargetName>MUtils32-1</TargetName>
137+ </PropertyGroup>
138+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
139+ <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
140+ <IntDir>$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
141+ <TargetName>MUtils32-1</TargetName>
142+ </PropertyGroup>
143+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">
144+ <OutDir>$(SolutionDir)\bin\$(Platform)\$(Configuration)\</OutDir>
145+ <IntDir>$(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
146+ <TargetName>MUtils32-1</TargetName>
147+ </PropertyGroup>
148+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
149+ <ClCompile>
150+ <PrecompiledHeader>
151+ </PrecompiledHeader>
152+ <WarningLevel>Level3</WarningLevel>
153+ <Optimization>Disabled</Optimization>
154+ <PreprocessorDefinitions>WIN32;MUTILS_DLL_EXPORT;_DEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
156+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
157+ <AdditionalIncludeDirectories>$(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158+ <TreatWarningAsError>true</TreatWarningAsError>
159+ <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
160+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
161+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
162+ </ClCompile>
163+ <Link>
164+ <SubSystem>Windows</SubSystem>
165+ <GenerateDebugInformation>true</GenerateDebugInformation>
166+ <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
167+ <AdditionalDependencies>QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
168+ </Link>
169+ </ItemDefinitionGroup>
170+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
171+ <ClCompile>
172+ <WarningLevel>Level3</WarningLevel>
173+ <PrecompiledHeader>
174+ </PrecompiledHeader>
175+ <Optimization>Full</Optimization>
176+ <FunctionLevelLinking>true</FunctionLevelLinking>
177+ <IntrinsicFunctions>true</IntrinsicFunctions>
178+ <PreprocessorDefinitions>WIN32;MUTILS_DLL_EXPORT;NDEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
180+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
181+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
182+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
183+ <OmitFramePointers>true</OmitFramePointers>
184+ <BufferSecurityCheck>false</BufferSecurityCheck>
185+ <FloatingPointModel>Fast</FloatingPointModel>
186+ <CreateHotpatchableImage>false</CreateHotpatchableImage>
187+ <AdditionalIncludeDirectories>$(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
188+ <TreatWarningAsError>true</TreatWarningAsError>
189+ <CompileAsManaged>false</CompileAsManaged>
190+ </ClCompile>
191+ <Link>
192+ <SubSystem>Windows</SubSystem>
193+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
194+ <OptimizeReferences>true</OptimizeReferences>
195+ <AdditionalLibraryDirectories>$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32</AdditionalLibraryDirectories>
196+ <AdditionalDependencies>QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
197+ <GenerateDebugInformation>false</GenerateDebugInformation>
198+ </Link>
199+ </ItemDefinitionGroup>
200+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">
201+ <ClCompile>
202+ <WarningLevel>Level3</WarningLevel>
203+ <PrecompiledHeader>
204+ </PrecompiledHeader>
205+ <Optimization>Full</Optimization>
206+ <FunctionLevelLinking>true</FunctionLevelLinking>
207+ <IntrinsicFunctions>true</IntrinsicFunctions>
208+ <PreprocessorDefinitions>WIN32;MUTILS_STATIC_LIB;NDEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NODLL;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
209+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
210+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
211+ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
212+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
213+ <OmitFramePointers>true</OmitFramePointers>
214+ <BufferSecurityCheck>false</BufferSecurityCheck>
215+ <FloatingPointModel>Fast</FloatingPointModel>
216+ <CreateHotpatchableImage>false</CreateHotpatchableImage>
217+ <AdditionalIncludeDirectories>$(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
218+ <TreatWarningAsError>true</TreatWarningAsError>
219+ <CompileAsManaged>false</CompileAsManaged>
220+ </ClCompile>
221+ <Link>
222+ <SubSystem>Windows</SubSystem>
223+ <GenerateDebugInformation>true</GenerateDebugInformation>
224+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
225+ <OptimizeReferences>true</OptimizeReferences>
226+ </Link>
227+ </ItemDefinitionGroup>
228+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
229+ <ImportGroup Label="ExtensionTargets">
230+ </ImportGroup>
231+</Project>
\ No newline at end of file
--- /dev/null
+++ b/MUtilities_VS2015.vcxproj.filters
@@ -0,0 +1,182 @@
1+<?xml version="1.0" encoding="utf-8"?>
2+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+ <ItemGroup>
4+ <Filter Include="Source Files">
5+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+ </Filter>
8+ <Filter Include="Header Files">
9+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+ </Filter>
12+ <Filter Include="Resource Files">
13+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+ </Filter>
16+ <Filter Include="Public Headers">
17+ <UniqueIdentifier>{d47fbdba-5e24-460a-bba8-824ea0fe874c}</UniqueIdentifier>
18+ </Filter>
19+ <Filter Include="Source Files\Generated">
20+ <UniqueIdentifier>{458f07b7-5414-4e9c-a599-222196e8d2e8}</UniqueIdentifier>
21+ </Filter>
22+ <Filter Include="Source Files\3rd Party">
23+ <UniqueIdentifier>{d5bcdb46-27a3-4772-86b4-1b30e02a30cc}</UniqueIdentifier>
24+ </Filter>
25+ <Filter Include="Header Files\3rd Party">
26+ <UniqueIdentifier>{6261ec8d-8041-495b-bddf-6fe07c11c952}</UniqueIdentifier>
27+ </Filter>
28+ </ItemGroup>
29+ <ItemGroup>
30+ <ClCompile Include="src\UpdateChecker.cpp">
31+ <Filter>Source Files</Filter>
32+ </ClCompile>
33+ <ClCompile Include="src\Global.cpp">
34+ <Filter>Source Files</Filter>
35+ </ClCompile>
36+ <ClCompile Include="src\OSSupport_Win32.cpp">
37+ <Filter>Source Files</Filter>
38+ </ClCompile>
39+ <ClCompile Include="src\Version.cpp">
40+ <Filter>Source Files</Filter>
41+ </ClCompile>
42+ <ClCompile Include="src\CPUFeatures_Win32.cpp">
43+ <Filter>Source Files</Filter>
44+ </ClCompile>
45+ <ClCompile Include="src\DLLMain.cpp">
46+ <Filter>Source Files</Filter>
47+ </ClCompile>
48+ <ClCompile Include="src\Terminal_Win32.cpp">
49+ <Filter>Source Files</Filter>
50+ </ClCompile>
51+ <ClCompile Include="src\Startup.cpp">
52+ <Filter>Source Files</Filter>
53+ </ClCompile>
54+ <ClCompile Include="src\ErrorHandler_Win32.cpp">
55+ <Filter>Source Files</Filter>
56+ </ClCompile>
57+ <ClCompile Include="src\GUI.cpp">
58+ <Filter>Source Files</Filter>
59+ </ClCompile>
60+ <ClCompile Include="src\3rd_party\strnatcmp\src\strnatcmp.cpp">
61+ <Filter>Source Files\3rd Party</Filter>
62+ </ClCompile>
63+ <ClCompile Include="$(SolutionDir)\tmp\$(ProjectName)\MOC_UpdateChecker.cpp">
64+ <Filter>Source Files\Generated</Filter>
65+ </ClCompile>
66+ <ClCompile Include="src\Sound_Win32.cpp">
67+ <Filter>Source Files</Filter>
68+ </ClCompile>
69+ <ClCompile Include="src\JobObject_Win32.cpp">
70+ <Filter>Source Files</Filter>
71+ </ClCompile>
72+ <ClCompile Include="src\GUI_Win32.cpp">
73+ <Filter>Source Files</Filter>
74+ </ClCompile>
75+ <ClCompile Include="src\IPCChannel.cpp">
76+ <Filter>Source Files</Filter>
77+ </ClCompile>
78+ <ClCompile Include="src\3rd_party\adler32\src\adler32.cpp">
79+ <Filter>Source Files\3rd Party</Filter>
80+ </ClCompile>
81+ <ClCompile Include="src\Taskbar7_Win32.cpp">
82+ <Filter>Source Files</Filter>
83+ </ClCompile>
84+ <ClCompile Include="src\Translation.cpp">
85+ <Filter>Source Files</Filter>
86+ </ClCompile>
87+ <ClCompile Include="$(SolutionDir)\tmp\$(ProjectName)\QRC_MUtilsData.cpp">
88+ <Filter>Source Files\Generated</Filter>
89+ </ClCompile>
90+ <ClCompile Include="src\Hash_Keccak.cpp">
91+ <Filter>Source Files</Filter>
92+ </ClCompile>
93+ <ClCompile Include="src\Hash_Blake2.cpp">
94+ <Filter>Source Files</Filter>
95+ </ClCompile>
96+ <ClCompile Include="src\3rd_party\blake2\src\blake2.cpp">
97+ <Filter>Source Files\3rd Party</Filter>
98+ </ClCompile>
99+ <ClCompile Include="src\Registry_Win32.cpp">
100+ <Filter>Source Files</Filter>
101+ </ClCompile>
102+ </ItemGroup>
103+ <ItemGroup>
104+ <ClInclude Include="src\CriticalSection_Win32.h">
105+ <Filter>Header Files</Filter>
106+ </ClInclude>
107+ <ClInclude Include="include\MUtils\Exception.h">
108+ <Filter>Public Headers</Filter>
109+ </ClInclude>
110+ <ClInclude Include="include\MUtils\Global.h">
111+ <Filter>Public Headers</Filter>
112+ </ClInclude>
113+ <ClInclude Include="include\MUtils\OSSupport.h">
114+ <Filter>Public Headers</Filter>
115+ </ClInclude>
116+ <ClInclude Include="include\MUtils\Version.h">
117+ <Filter>Public Headers</Filter>
118+ </ClInclude>
119+ <ClInclude Include="src\DirLocker.h">
120+ <Filter>Header Files</Filter>
121+ </ClInclude>
122+ <ClInclude Include="include\MUtils\CPUFeatures.h">
123+ <Filter>Public Headers</Filter>
124+ </ClInclude>
125+ <ClInclude Include="include\MUtils\Terminal.h">
126+ <Filter>Public Headers</Filter>
127+ </ClInclude>
128+ <ClInclude Include="include\MUtils\Startup.h">
129+ <Filter>Public Headers</Filter>
130+ </ClInclude>
131+ <ClInclude Include="include\MUtils\ErrorHandler.h">
132+ <Filter>Public Headers</Filter>
133+ </ClInclude>
134+ <ClInclude Include="include\MUtils\GUI.h">
135+ <Filter>Public Headers</Filter>
136+ </ClInclude>
137+ <ClInclude Include="src\3rd_party\strnatcmp\include\strnatcmp.h">
138+ <Filter>Header Files\3rd Party</Filter>
139+ </ClInclude>
140+ <ClInclude Include="src\3rd_party\keccak\include\keccak_impl.h">
141+ <Filter>Header Files\3rd Party</Filter>
142+ </ClInclude>
143+ <ClInclude Include="include\MUtils\Sound.h">
144+ <Filter>Public Headers</Filter>
145+ </ClInclude>
146+ <ClInclude Include="include\MUtils\JobObject.h">
147+ <Filter>Public Headers</Filter>
148+ </ClInclude>
149+ <ClInclude Include="include\MUtils\IPCChannel.h">
150+ <Filter>Public Headers</Filter>
151+ </ClInclude>
152+ <ClInclude Include="src\3rd_party\adler32\include\adler32.h">
153+ <Filter>Header Files\3rd Party</Filter>
154+ </ClInclude>
155+ <ClInclude Include="include\MUtils\Taskbar7.h">
156+ <Filter>Public Headers</Filter>
157+ </ClInclude>
158+ <ClInclude Include="include\MUtils\Translation.h">
159+ <Filter>Public Headers</Filter>
160+ </ClInclude>
161+ <ClInclude Include="include\MUtils\Hash_Blake2.h">
162+ <Filter>Public Headers</Filter>
163+ </ClInclude>
164+ <ClInclude Include="include\MUtils\Hash_Keccak.h">
165+ <Filter>Public Headers</Filter>
166+ </ClInclude>
167+ <ClInclude Include="src\3rd_party\blake2\include\blake2.h">
168+ <Filter>Header Files\3rd Party</Filter>
169+ </ClInclude>
170+ <ClInclude Include="include\MUtils\Registry.h">
171+ <Filter>Public Headers</Filter>
172+ </ClInclude>
173+ </ItemGroup>
174+ <ItemGroup>
175+ <CustomBuild Include="include\Mutils\UpdateChecker.h">
176+ <Filter>Public Headers</Filter>
177+ </CustomBuild>
178+ <CustomBuild Include="res\MUtilsData.qrc">
179+ <Filter>Resource Files</Filter>
180+ </CustomBuild>
181+ </ItemGroup>
182+</Project>
\ No newline at end of file
--- a/include/MUtils/Global.h
+++ b/include/MUtils/Global.h
@@ -109,7 +109,7 @@ namespace MUtils
109109 namespace Internal
110110 {
111111 MUTILS_API int selfTest(const char *const buildKey, const bool debug);
112- static const int g_test = selfTest(__DATE__"@"__TIME__, MUTILS_DEBUG);
112+ static const int s_selfTest = selfTest(__DATE__ "@" __TIME__, MUTILS_DEBUG);
113113 }
114114 }
115115
--- a/include/MUtils/Version.h
+++ b/include/MUtils/Version.h
@@ -66,7 +66,13 @@ namespace MUtils
6666 #error Compiler is not supported!
6767 #endif
6868 #elif defined(_MSC_VER)
69- #if (_MSC_VER == 1800)
69+ #if (_MSC_VER == 1900)
70+ #if (_MSC_FULL_VER == 190023026)
71+ static const char *const COMPILER_VERS = "MSVC 2015";
72+ #else
73+ #error Compiler version is not supported yet!
74+ #endif
75+ #elif (_MSC_VER == 1800)
7076 #if (_MSC_FULL_VER == 180021005)
7177 static const char *const COMPILER_VERS = "MSVC 2013";
7278 #elif (_MSC_FULL_VER == 180030501)
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -547,7 +547,7 @@ QStringList MUtils::available_codepages(const bool &noAliases)
547547 int MUtils::Internal::selfTest(const char *const buildKey, const bool debug)
548548 {
549549 static const bool MY_DEBUG_FLAG = MUTILS_DEBUG;
550- static const char *const MY_BUILD_KEY = __DATE__"@"__TIME__;
550+ static const char *const MY_BUILD_KEY = __DATE__ "@" __TIME__;
551551
552552 if(strncmp(buildKey, MY_BUILD_KEY, 13) || (MY_DEBUG_FLAG != debug))
553553 {
--- a/src/Hash_Blake2.cpp
+++ b/src/Hash_Blake2.cpp
@@ -76,7 +76,7 @@ MUtils::Hash::Blake2::Blake2(const char* key)
7676 {
7777 if(key && key[0])
7878 {
79- blake2b_init_key(m_context->state, HASH_SIZE, key, strlen(key));
79+ blake2b_init_key(m_context->state, HASH_SIZE, key, (uint8_t)strlen(key));
8080 }
8181 else
8282 {
--- a/src/OSSupport_Win32.cpp
+++ b/src/OSSupport_Win32.cpp
@@ -27,7 +27,10 @@
2727 #include <Shellapi.h>
2828 #include <PowrProf.h>
2929 #include <Mmsystem.h>
30+#pragma warning(push)
31+#pragma warning(disable:4091) //for MSVC2015
3032 #include <ShlObj.h>
33+#pragma warning(pop)
3134
3235 //Internal
3336 #include <MUtils/Global.h>
Show on old repository browser