From 4f16db680974df50555c1f246ad7b5b86bc92a4a Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Thu, 6 Aug 2015 20:49:50 +0200 Subject: [PATCH] Added project/solution files for VS2015 + some build fixes for VS2015. --- MUtilities_VS2013.vcxproj | 4 +- MUtilities_VS2015.sln | 25 +++++ MUtilities_VS2015.vcxproj | 231 ++++++++++++++++++++++++++++++++++++++ MUtilities_VS2015.vcxproj.filters | 182 ++++++++++++++++++++++++++++++ include/MUtils/Global.h | 2 +- include/MUtils/Version.h | 8 +- src/Global.cpp | 2 +- src/Hash_Blake2.cpp | 2 +- src/OSSupport_Win32.cpp | 3 + 9 files changed, 453 insertions(+), 6 deletions(-) create mode 100644 MUtilities_VS2015.sln create mode 100644 MUtilities_VS2015.vcxproj create mode 100644 MUtilities_VS2015.vcxproj.filters diff --git a/MUtilities_VS2013.vcxproj b/MUtilities_VS2013.vcxproj index 9abfbd0..ddc5b25 100644 --- a/MUtilities_VS2013.vcxproj +++ b/MUtilities_VS2013.vcxproj @@ -163,7 +163,7 @@ Windows true - $(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies) @@ -192,7 +192,7 @@ Windows true true - $(SolutionDir)\..\Prerequisites\Qt4\MSVC-2013\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies) false diff --git a/MUtilities_VS2015.sln b/MUtilities_VS2015.sln new file mode 100644 index 0000000..e61abe1 --- /dev/null +++ b/MUtilities_VS2015.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilities_VS2015", "MUtilities_VS2015.vcxproj", "{55405FE1-149F-434C-9D72-4B64348D2A08}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release_Static|Win32 = Release_Static|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {55405FE1-149F-434C-9D72-4B64348D2A08}.Debug|Win32.ActiveCfg = Debug|Win32 + {55405FE1-149F-434C-9D72-4B64348D2A08}.Debug|Win32.Build.0 = Debug|Win32 + {55405FE1-149F-434C-9D72-4B64348D2A08}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {55405FE1-149F-434C-9D72-4B64348D2A08}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.ActiveCfg = Release|Win32 + {55405FE1-149F-434C-9D72-4B64348D2A08}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/MUtilities_VS2015.vcxproj b/MUtilities_VS2015.vcxproj new file mode 100644 index 0000000..9181bc0 --- /dev/null +++ b/MUtilities_VS2015.vcxproj @@ -0,0 +1,231 @@ + + + + + Debug + Win32 + + + Release_Static + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs) + "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" "%(FullPath)" + MOC "$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs) + + + + + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + + + + {55405FE1-149F-434C-9D72-4B64348D2A08} + Win32Proj + MUtilities + MUtilities + + + + DynamicLibrary + true + v140_xp + Unicode + + + DynamicLibrary + false + v140_xp + true + Unicode + + + StaticLibrary + false + v140_xp + true + Unicode + + + + + + + + + + + + + + + + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + MUtils32-1 + + + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + MUtils32-1 + + + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + MUtils32-1 + + + + + + Level3 + Disabled + WIN32;MUTILS_DLL_EXPORT;_DEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + NoExtensions + $(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories) + true + Disabled + Default + ProgramDatabase + + + Windows + true + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 + QtCored4.lib;QtGuid4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;MUTILS_DLL_EXPORT;NDEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_NO_DEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + NoExtensions + AnySuitable + Speed + true + false + Fast + false + $(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories) + true + false + + + Windows + true + true + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\lib;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\lib\Win32 + QtCore4.lib;QtGui4.lib;Winmm.lib;Psapi.lib;Sensapi.lib;PowrProf.lib;Shlwapi.lib;Version.lib;%(AdditionalDependencies) + false + + + + + Level3 + + + Full + true + true + WIN32;MUTILS_STATIC_LIB;NDEBUG;_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NODLL;QT_NO_DEBUG;%(PreprocessorDefinitions) + MultiThreaded + NoExtensions + AnySuitable + Speed + true + false + Fast + false + $(ProjectDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories) + true + false + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/MUtilities_VS2015.vcxproj.filters b/MUtilities_VS2015.vcxproj.filters new file mode 100644 index 0000000..1bcd39b --- /dev/null +++ b/MUtilities_VS2015.vcxproj.filters @@ -0,0 +1,182 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {d47fbdba-5e24-460a-bba8-824ea0fe874c} + + + {458f07b7-5414-4e9c-a599-222196e8d2e8} + + + {d5bcdb46-27a3-4772-86b4-1b30e02a30cc} + + + {6261ec8d-8041-495b-bddf-6fe07c11c952} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\3rd Party + + + Source Files\Generated + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\3rd Party + + + Source Files + + + Source Files + + + Source Files\Generated + + + Source Files + + + Source Files + + + Source Files\3rd Party + + + Source Files + + + + + Header Files + + + Public Headers + + + Public Headers + + + Public Headers + + + Public Headers + + + Header Files + + + Public Headers + + + Public Headers + + + Public Headers + + + Public Headers + + + Public Headers + + + Header Files\3rd Party + + + Header Files\3rd Party + + + Public Headers + + + Public Headers + + + Public Headers + + + Header Files\3rd Party + + + Public Headers + + + Public Headers + + + Public Headers + + + Public Headers + + + Header Files\3rd Party + + + Public Headers + + + + + Public Headers + + + Resource Files + + + \ No newline at end of file diff --git a/include/MUtils/Global.h b/include/MUtils/Global.h index bc5a438..59b360c 100644 --- a/include/MUtils/Global.h +++ b/include/MUtils/Global.h @@ -109,7 +109,7 @@ namespace MUtils namespace Internal { MUTILS_API int selfTest(const char *const buildKey, const bool debug); - static const int g_test = selfTest(__DATE__"@"__TIME__, MUTILS_DEBUG); + static const int s_selfTest = selfTest(__DATE__ "@" __TIME__, MUTILS_DEBUG); } } diff --git a/include/MUtils/Version.h b/include/MUtils/Version.h index c8ca5ee..3385a86 100644 --- a/include/MUtils/Version.h +++ b/include/MUtils/Version.h @@ -66,7 +66,13 @@ namespace MUtils #error Compiler is not supported! #endif #elif defined(_MSC_VER) - #if (_MSC_VER == 1800) + #if (_MSC_VER == 1900) + #if (_MSC_FULL_VER == 190023026) + static const char *const COMPILER_VERS = "MSVC 2015"; + #else + #error Compiler version is not supported yet! + #endif + #elif (_MSC_VER == 1800) #if (_MSC_FULL_VER == 180021005) static const char *const COMPILER_VERS = "MSVC 2013"; #elif (_MSC_FULL_VER == 180030501) diff --git a/src/Global.cpp b/src/Global.cpp index 5298b09..81046ed 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -547,7 +547,7 @@ QStringList MUtils::available_codepages(const bool &noAliases) int MUtils::Internal::selfTest(const char *const buildKey, const bool debug) { static const bool MY_DEBUG_FLAG = MUTILS_DEBUG; - static const char *const MY_BUILD_KEY = __DATE__"@"__TIME__; + static const char *const MY_BUILD_KEY = __DATE__ "@" __TIME__; if(strncmp(buildKey, MY_BUILD_KEY, 13) || (MY_DEBUG_FLAG != debug)) { diff --git a/src/Hash_Blake2.cpp b/src/Hash_Blake2.cpp index 816421f..451dffb 100644 --- a/src/Hash_Blake2.cpp +++ b/src/Hash_Blake2.cpp @@ -76,7 +76,7 @@ MUtils::Hash::Blake2::Blake2(const char* key) { if(key && key[0]) { - blake2b_init_key(m_context->state, HASH_SIZE, key, strlen(key)); + blake2b_init_key(m_context->state, HASH_SIZE, key, (uint8_t)strlen(key)); } else { diff --git a/src/OSSupport_Win32.cpp b/src/OSSupport_Win32.cpp index 1ceac1b..7012ad6 100644 --- a/src/OSSupport_Win32.cpp +++ b/src/OSSupport_Win32.cpp @@ -27,7 +27,10 @@ #include #include #include +#pragma warning(push) +#pragma warning(disable:4091) //for MSVC2015 #include +#pragma warning(pop) //Internal #include -- 2.11.0