Fix macOS build of new rglfw.c approach

There have been two problems:

* GLFW itself was compiled with the definitions for compiling
_against_ GLFW (fixed by removing requirement for external glfw)

* rglfw.c was being compiled as C code, although it includes
Objective C files.

This _might_ break the Windows build, needs to be checked.

Fixes #391, but as noted I'd prefer though a separate source directory
and build script for GLFW.
This commit is contained in:
Ahmad Fatoum 2017-11-22 22:33:47 +01:00
parent 899e1fbd94
commit b2acff66de
No known key found for this signature in database
GPG key ID: C3EAC3DE9321D59B
5 changed files with 8 additions and 16 deletions

View file

@ -140,9 +140,6 @@ float GetGesturePinchAngle(void); // Get gesture pinch ang
#if defined(GESTURES_IMPLEMENTATION)
#include <math.h> // Required for: atan2(), sqrt()
#include <stdint.h> // Required for: uint64_t
#if defined(_WIN32)
// Functions required to query time on Windows
int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
@ -154,6 +151,9 @@ float GetGesturePinchAngle(void); // Get gesture pinch ang
#endif
#include <sys/time.h> // Required for: timespec
#include <time.h> // Required for: clock_gettime()
#include <math.h> // Required for: atan2(), sqrt()
#include <stdint.h> // Required for: uint64_t
#endif
//----------------------------------------------------------------------------------