Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Merge branch 'core4' into feature/quick-start-py

Browse Source
feature/quick-start-py
kaetemi 3 years ago
parent 3fae9db854 a6139ade22
commit 9d991864c8
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
nel/src/misc/system_info.cpp
Unescape Escape View File

@ -1333,7 +1333,7 @@ uint64 CSystemInfo::getProcessorFrequency(bool quick)
static bool DetectMMX() static bool DetectMMX()
{ {
#ifdef NL_CPU_INTEL #if defined(NL_CPU_INTEL) && (defined(HAVE_X86_64) || !defined(NL_COMP_GCC))
if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ... if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ...
sint32 CPUInfo[4]; sint32 CPUInfo[4];
@ -1348,7 +1348,7 @@ static bool DetectMMX()
static bool DetectSSE() static bool DetectSSE()
{ {
#ifdef NL_CPU_INTEL #if defined(NL_CPU_INTEL) && (defined(HAVE_X86_64) || !defined(NL_COMP_GCC))
if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ... if (!CSystemInfo::hasCPUID()) return false; // cpuid not supported ...
sint32 CPUInfo[4]; sint32 CPUInfo[4];

Write Preview
Loading…
Cancel
Save