From b2acff66dec7bce30e9704aa9b13070f7c3ffac1 Mon Sep 17 00:00:00 2001
From: Ahmad Fatoum <ahmad@a3f.at>
Date: Wed, 22 Nov 2017 22:33:47 +0100
Subject: 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.
---
 src/CMakeLists.txt | 6 +++---
 src/gestures.h     | 6 +++---
 src/rglfw.c        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a398d665..f362b52f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,6 +20,7 @@ set(OPENGL_VERSION "3.3" CACHE STRING "OpenGL Version to build raylib with")
 set_property(CACHE OPENGL_VERSION PROPERTY STRINGS "3.3" "2.1" "1.1" "ES 2.0")
 ### Config options ###
 
+include_directories(external/glfw/include)
 
 # Translate the config options to what raylib wants
 if(${PLATFORM} MATCHES "Desktop")
@@ -40,6 +41,8 @@ if(${PLATFORM} MATCHES "Desktop")
   # See: https://github.com/raysan5/raylib/issues/341
   if(APPLE)
     set(GRAPHICS "GRAPHICS_API_OPENGL_33")
+    set_source_files_properties(rglfw.c PROPERTIES COMPILE_FLAGS "-x objective-c")
+    link_libraries("-framework CoreFoundation -framework Cocoa -framework IOKit -framework CoreVideo")
   endif()
 elseif(${PLATFORM} MATCHES "Web")
   set(PLATFORM "PLATFORM_WEB")
@@ -93,9 +96,6 @@ if(${PLATFORM} MATCHES "PLATFORM_DESKTOP")
     target_link_libraries(${RAYLIB} GL)
   endif()
   
-  # Add in GLFW as a linking target
-  target_link_libraries(${RAYLIB} glfw)
-  
   # Library file & Header
   set_target_properties(${RAYLIB} PROPERTIES PUBLIC_HEADER "raylib.h")
   install(
diff --git a/src/gestures.h b/src/gestures.h
index 2e343154..e2f004e2 100644
--- a/src/gestures.h
+++ b/src/gestures.h
@@ -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
 
 //----------------------------------------------------------------------------------
diff --git a/src/rglfw.c b/src/rglfw.c
index b1b4eed7..83e0021b 100644
--- a/src/rglfw.c
+++ b/src/rglfw.c
@@ -86,5 +86,5 @@
     #include "external/glfw/src/posix_thread.c"
     #include "external/glfw/src/nsgl_context.m" 
     #include "external/glfw/src/egl_context.c" 
-    #include "external/glfw/src/osmesa_context.c.m"
+    #include "external/glfw/src/osmesa_context.c"
 #endif
-- 
cgit v1.2.3