diff --git a/MUtilities_VS2013.sln b/MUtilities_VS2013.sln index 18316ad..f1b7066 100644 --- a/MUtilities_VS2013.sln +++ b/MUtilities_VS2013.sln @@ -1,9 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilities_VS2013", "MUtilities_VS2013.vcxproj", "{55405FE1-149F-434C-9D72-4B64348D2A08}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilities", "MUtilities_VS2013.vcxproj", "{55405FE1-149F-434C-9D72-4B64348D2A08}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MUtilitiesTest", "test\MUtilitiesTest_VS2013.vcxproj", "{B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,6 +20,12 @@ Global {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 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Debug|Win32.ActiveCfg = Debug|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Debug|Win32.Build.0 = Debug|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release|Win32.ActiveCfg = Release|Win32 + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/include/MUtils/CPUFeatures.h b/include/MUtils/CPUFeatures.h index d9028f0..9972a3c 100644 --- a/include/MUtils/CPUFeatures.h +++ b/include/MUtils/CPUFeatures.h @@ -44,8 +44,8 @@ namespace MUtils namespace CPUFetaures { // CPU vendor flag - static const uint8_t VENDOR_INTEL = 0x01U; ///< \brief CPU vendor flag \details Indicates that the CPU's vendor is *Intel* - static const uint8_t VENDOR_AMD = 0x02U; ///< \brief CPU vendor flag \details Indicates that the CPU's vendor is *AMD* + static const quint8 VENDOR_INTEL = 0x01U; ///< \brief CPU vendor flag \details Indicates that the CPU's vendor is *Intel* + static const quint8 VENDOR_AMD = 0x02U; ///< \brief CPU vendor flag \details Indicates that the CPU's vendor is *AMD* // CPU feature flag static const quint32 FLAG_CMOV = 0x001U; ///< \brief CPU feature flag \details Indicates that the CPU supports the *CMOV* instruction @@ -69,7 +69,7 @@ namespace MUtils quint32 count; ///< The number of available (logical) processors quint32 features; ///< CPU *feature* flags, indicating suppoprt for extended instruction sets; all flags are OR-combined bool x64; ///< Indicates that the processor and the operating system support 64-Bit (AMD64/EM64T) - uint8_t vendor; ///< CPU *vendor* flag; might be zero, if vendor is unknown + quint8 vendor; ///< CPU *vendor* flag; might be zero, if vendor is unknown char idstr[13]; ///< CPU *identifier* string, exactly 12 characters (e.g. "GenuineIntel" or "AuthenticAMD") char brand[48]; ///< CPU *brand* string, up to 48 characters (e.g. "Intel(R) Core(TM) i7-6700K CPU @ 4.00GHz") } diff --git a/test/MUtilitiesTest_VS2013.vcxpro.filters b/test/MUtilitiesTest_VS2013.vcxpro.filters new file mode 100644 index 0000000..fd182b9 --- /dev/null +++ b/test/MUtilitiesTest_VS2013.vcxpro.filters @@ -0,0 +1,30 @@ + + + + + {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 + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/test/MUtilitiesTest_VS2013.vcxproj b/test/MUtilitiesTest_VS2013.vcxproj new file mode 100644 index 0000000..d454cc8 --- /dev/null +++ b/test/MUtilitiesTest_VS2013.vcxproj @@ -0,0 +1,160 @@ + + + + + Debug + Win32 + + + Release_Static + Win32 + + + Release + Win32 + + + + + + + + + + + + {55405fe1-149f-434c-9d72-4b64348d2a08} + + + + {B7BCA0A5-17AD-4F20-A42C-CD6FFBD55D89} + Win32Proj + MUtilitiesTest_VS2015 + 8.1 + MUtilitiesTest + + + + Application + true + v120_xp + Unicode + + + Application + false + v120_xp + true + Unicode + + + Application + false + v120_xp + true + Unicode + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + false + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + false + $(SolutionDir)\bin\$(Platform)\$(Configuration)\ + $(SolutionDir)\obj\$(Platform)\$(Configuration)\$(ProjectName)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DEBUG;%(PreprocessorDefinitions) + $(SolutionDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + NoExtensions + + + Console + true + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\lib;$(SolutionDir)\..\Prerequisites\GoogleTest\lib\$(PlatformToolset)\Debug;%(AdditionalLibraryDirectories) + gtestd.lib;QtCored4.lib;QtGuid4.lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_CONSOLE;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG;%(PreprocessorDefinitions) + $(SolutionDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL + NoExtensions + false + AnySuitable + Speed + true + + + Console + true + true + true + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\lib;$(SolutionDir)\..\Prerequisites\GoogleTest\lib\$(PlatformToolset)\Shared;%(AdditionalLibraryDirectories) + gtest.lib;QtCore4.lib;QtGui4.lib;%(AdditionalDependencies) + + + + + Level3 + + + Full + true + true + WIN32;NDEBUG;_CONSOLE;MUTILS_STATIC_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NODLL;QT_NO_DEBUG;%(PreprocessorDefinitions) + $(SolutionDir)\include;$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(SolutionDir)\..\Prerequisites\GoogleTest\include;%(AdditionalIncludeDirectories) + MultiThreaded + NoExtensions + false + AnySuitable + Speed + true + + + Console + true + true + true + $(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Static\lib;$(SolutionDir)\..\Prerequisites\GoogleTest\lib\$(PlatformToolset)\Static;%(AdditionalLibraryDirectories) + gtest.lib;QtCore.lib;QtGui.lib;Ws2_32.lib;Winmm.lib;Imm32.lib;PowrProf.lib;Version.lib;Psapi.lib;Sensapi.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file