diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters
index cd8c7712..79971cbb 100644
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -881,168 +881,168 @@
Header Files\Models
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
+
+ Resources
+
Miscellaneous
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
-
- Resources
-
diff --git a/src/Config.h b/src/Config.h
index 8f26ad4d..b10e69c2 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 2
-#define VER_LAMEXP_BUILD 1942
+#define VER_LAMEXP_BUILD 1945
#define VER_LAMEXP_CONFG 1934
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Main.cpp b/src/Main.cpp
index 0889c6e5..4e24121c 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -207,10 +207,11 @@ static int lamexp_main(int &argc, char **argv)
//Detect CPU capabilities
const MUtils::CPUFetaures::cpu_info_t cpuFeatures = MUtils::CPUFetaures::detect();
- qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.vendor, MUTILS_BOOL2STR(cpuFeatures.intel));
+ qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.idstr, MUTILS_BOOL2STR(cpuFeatures.vendor & MUtils::CPUFetaures::VENDOR_INTEL));
qDebug("CPU brand string : %s", cpuFeatures.brand);
qDebug(" CPU signature : Family=%d Model=%d Stepping=%d", cpuFeatures.family, cpuFeatures.model, cpuFeatures.stepping);
- qDebug("CPU capabilities : SSE=%s SSE2=%s SSE3=%s SSSE3=%s SSE4=%s SSE4.2=%s AVX=%s x64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX), MUTILS_BOOL2STR(cpuFeatures.x64));
+ qDebug("CPU capabilities : CMOV=%s MMX=%s SSE=%s SSE2=%s SSE3=%s SSSE3=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_CMOV), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_MMX), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3));
+ qDebug("CPU capabilities : SSE4.1=%s SSE4.2=%s AVX=%s EM64T/AMD64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX), MUTILS_BOOL2STR(cpuFeatures.x64));
qDebug(" Number of CPU's : %d\n", cpuFeatures.count);
//Initialize Qt
diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp
index 9655451b..65fd527c 100644
--- a/src/Thread_Initialization.cpp
+++ b/src/Thread_Initialization.cpp
@@ -351,7 +351,8 @@ double InitializationThread::doInit(const size_t threadCount)
//CPU type selection
unsigned int cpuSupport = 0;
- if((m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE) && (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2) && m_cpuFeatures.intel)
+ const bool haveSSE2 = (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE) && (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2);
+ if(haveSSE2 && (m_cpuFeatures.vendor & MUtils::CPUFetaures::VENDOR_INTEL))
{
if (m_cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX)
{