diff options
| author | Ahmad Fatoum <[email protected]> | 2017-11-22 22:33:47 +0100 |
|---|---|---|
| committer | Ahmad Fatoum <[email protected]> | 2017-11-22 23:11:41 +0100 |
| commit | b2acff66dec7bce30e9704aa9b13070f7c3ffac1 (patch) | |
| tree | 1d8b7e639a550c8006f2e7987c2d8f1e4eac83cb /src/CMakeLists.txt | |
| parent | 899e1fbd94f697d95b9684e272de5410b08edc06 (diff) | |
| download | raylib-b2acff66dec7bce30e9704aa9b13070f7c3ffac1.tar.gz raylib-b2acff66dec7bce30e9704aa9b13070f7c3ffac1.zip | |
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.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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( |