From 91827e7d2a66bc97f579d47484667cb999e42110 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 6 Apr 2016 13:40:08 -0400 Subject: [PATCH] Define PLATFORM_PANDORA instead of PANDORA, to match other targets. --- Sources/CMakeLists.txt | 2 +- Sources/Engine/Base/Timer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 213a22b..3c04132 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -104,7 +104,7 @@ endif() option(PANDORA "Compile for Pandora" FALSE) if (PANDORA) - add_definitions(-DPANDORA=1) + add_definitions(-DPLATFORM_PANDORA=1) endif() option(USE_TREMOR "Use Tremor instead of Vorbis" FALSE) diff --git a/Sources/Engine/Base/Timer.cpp b/Sources/Engine/Base/Timer.cpp index fb6dfe6..d1b33df 100644 --- a/Sources/Engine/Base/Timer.cpp +++ b/Sources/Engine/Base/Timer.cpp @@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc., static inline __int64 ReadTSC(void) { #if USE_GETTIMEOFDAY -#ifdef PANDORA +#ifdef PLATFORM_PANDORA struct timespec tp; clock_gettime(CLOCK_MONOTONIC, &tp); return( (((__int64) tp.tv_sec) * 1000000000LL) + ((__int64) tp.tv_nsec)); @@ -320,7 +320,7 @@ CTimer::CTimer(BOOL bInterrupt /*=TRUE*/) #if USE_GETTIMEOFDAY // just use gettimeofday. - #ifdef PANDORA + #ifdef PLATFORM_PANDORA tm_llCPUSpeedHZ = tm_llPerformanceCounterFrequency = 1000000000LL; #else tm_llCPUSpeedHZ = tm_llPerformanceCounterFrequency = 1000000;