# HG changeset patch # User Sebastien Jodogne # Date 1476716511 -7200 # Node ID fcff71deac7b090d21b39d1176389f3de84feef8 # Parent a60ff142ceb5221b5500f3a659ecae9290442fc2# Parent d9452f5a5346d3adf32ae4b911f8c48960e67644 merge diff -r a60ff142ceb5 -r fcff71deac7b Resources/CMake/SdlConfiguration.cmake --- a/Resources/CMake/SdlConfiguration.cmake Mon Oct 17 16:48:02 2016 +0200 +++ b/Resources/CMake/SdlConfiguration.cmake Mon Oct 17 17:01:51 2016 +0200 @@ -160,7 +160,7 @@ ${SDL_SOURCES_DIR}/src/render/software/*.c ${SDL_SOURCES_DIR}/src/thread/pthread/*.c ${SDL_SOURCES_DIR}/src/timer/unix/*.c - ${SDL_SOURCES_DIR}/src/video/cocoa/*.c + ${SDL_SOURCES_DIR}/src/video/cocoa/*.m ) list(APPEND SDL_SOURCES ${TMP}) @@ -171,18 +171,21 @@ -DSDL_TIMER_UNIX=1 -DSDL_POWER_DISABLED=1 - -DSDL_VIDEO_DRIVER_X11=1 + -DSDL_VIDEO_DRIVER_COCOA=1 -DSDL_VIDEO_OPENGL=1 - -DSDL_VIDEO_OPENGL_ES2=1 + -DSDL_VIDEO_OPENGL_CGL=1 -DSDL_VIDEO_RENDER_OGL=1 - -DSDL_VIDEO_RENDER_OGL_ES2=1 - -DSDL_VIDEO_OPENGL_GLX=1 - -DSDL_VIDEO_OPENGL_EGL=1 -DSDL_ASSEMBLY_ROUTINES=1 -DSDL_THREAD_PTHREAD_RECURSIVE_MUTEX=1 ) + find_library(CARBON_LIBRARY Carbon) + find_library(COCOA_LIBRARY Cocoa) + find_library(IOKIT_LIBRARY IOKit) + find_library(QUARTZ_LIBRARY QuartzCore) + link_libraries(${CARBON_LIBRARY} ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${QUARTZ_LIBRARY}) + endif() else()