From 1984179657b4f38dcefdba43145bb23b4b7084df Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Wed, 21 Sep 2016 17:14:06 +0200 Subject: [PATCH] Fixed a missing #endif issue --- Sources/Engine/Engine.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Sources/Engine/Engine.cpp b/Sources/Engine/Engine.cpp index 8bb4936..b5a530d 100755 --- a/Sources/Engine/Engine.cpp +++ b/Sources/Engine/Engine.cpp @@ -128,13 +128,6 @@ BOOL APIENTRY DllMain( HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReser static void DetectCPU(void) { 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; ULONG ulTFMS = 0; ULONG ulFeatures = 0; @@ -221,8 +214,11 @@ static void DetectCPU(void) sys_iCPUStepping = iStepping; sys_bCPUHasMMX = bMMX!=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); - +#endif if( !bMMX) FatalError( TRANS("MMX support required but not present!")); }