diff options
| author | Benjamin Summerton <define-private-public@users.noreply.github.com> | 2017-07-30 23:56:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-30 23:56:58 -0400 |
| commit | 71d9426565e37b9182be03fdd3706ce1e963bf7d (patch) | |
| tree | e21da00b6cb7c003123f3f2edd81602a9b5af74d /src | |
| parent | d071418cba7491ce6302ba14ed84acb8cc5f2063 (diff) | |
| download | raylib-71d9426565e37b9182be03fdd3706ce1e963bf7d.tar.gz raylib-71d9426565e37b9182be03fdd3706ce1e963bf7d.zip | |
Make physac work on OS X
Physac wasn't working on OS X. It looks like the necessary timing code wasn't being compiled in by the preprocessor.
fixes #340
Diffstat (limited to 'src')
| -rw-r--r-- | src/physac.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/physac.h b/src/physac.h index 8c109935..5ecd2815 100644 --- a/src/physac.h +++ b/src/physac.h @@ -252,7 +252,7 @@ PHYSACDEF void ClosePhysics(void); // Functions required to query time on Windows int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); -#elif defined(__linux__) || defined(PLATFORM_WEB) +#elif defined(__linux__) || defined(__APPLE__) || defined(PLATFORM_WEB) #define _POSIX_C_SOURCE 199309L // Required for CLOCK_MONOTONIC if compiled with c99 without gnu ext. //#define _DEFAULT_SOURCE // Enables BSD function definitions and C99 POSIX compliance #include <sys/time.h> // Required for: timespec @@ -282,7 +282,7 @@ static pthread_t physicsThreadId; // Physics thread id static unsigned int usedMemory = 0; // Total allocated dynamic memory static bool physicsThreadEnabled = false; // Physics thread enabled state static double currentTime = 0; // Current time in milliseconds -#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(__linux__) || defined(PLATFORM_WEB) +#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(__linux__) || defined(__APPLE__) || defined(PLATFORM_WEB) static double baseTime = 0; // Android and RPI platforms base time #endif static double startTime = 0; // Start time in milliseconds @@ -1907,7 +1907,7 @@ static double GetCurrentTime(void) time = (double)((double)currentTime/clockFrequency)*1000; #endif - #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(__linux__) || defined(PLATFORM_WEB) + #if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(__linux__) || defined(__APPLE__) || defined(PLATFORM_WEB) struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); uint64_t temp = (uint64_t)ts.tv_sec*1000000000LLU + (uint64_t)ts.tv_nsec; |