q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 18:30:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a missing #endif issue

Browse Source
This commit is contained in:
ptitSeb 2016-09-21 17:14:06 +02:00
parent 2aa09480ab
commit 1984179657
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/Engine/Engine.cpp
View File

@ -128,13 +128,6 @@ BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReser
static void DetectCPU(void) static void DetectCPU(void)
{ {
char strVendor[12+1] = { 0 }; char strVendor[12+1] = { 0 };
#if (defined USE_PORTABLE_C) // rcg10072001
CPrintF(TRANSV(" (No CPU detection in this binary.)\n"));
#ifdef PLATFORM_PANDORA
sys_iCPUMHz = 400; // conservative, ARM -> x86 cpu translation is not 1 to 1.
#endif
#else
strVendor[12] = 0; strVendor[12] = 0;
ULONG ulTFMS = 0; ULONG ulTFMS = 0;
ULONG ulFeatures = 0; ULONG ulFeatures = 0;
@ -221,8 +214,11 @@ static void DetectCPU(void)
sys_iCPUStepping = iStepping; sys_iCPUStepping = iStepping;
sys_bCPUHasMMX = bMMX!=0; sys_bCPUHasMMX = bMMX!=0;
sys_bCPUHasCMOV = bCMOV!=0; sys_bCPUHasCMOV = bCMOV!=0;
#ifdef PLATFORM_PANDORA
sys_iCPUMHz = 400; // conservative, ARM -> x86 cpu translation is not 1 to 1.
#else
sys_iCPUMHz = INDEX(_pTimer->tm_llCPUSpeedHZ/1E6); sys_iCPUMHz = INDEX(_pTimer->tm_llCPUSpeedHZ/1E6);
#endif
if( !bMMX) FatalError( TRANS("MMX support required but not present!")); if( !bMMX) FatalError( TRANS("MMX support required but not present!"));
} }