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

@ -6,10 +6,6 @@ if(UNIX AND NOT APPLE)
set(LINUX TRUE)
endif()
# Need GLFW 3.2.1
find_package(glfw3 3.2.1 REQUIRED)
# Linking for OS X -framework options
# Will do nothing on other OSes
function(link_os_x_frameworks binary)
@ -40,9 +36,6 @@ function(link_libraries_to_executable executable)
# TODO windows
endif()
# Add in GLFW as a linking target
target_link_libraries(${executable} glfw)
# And raylib
target_link_libraries(${executable} raylib)
endfunction()