Mercurial > hg > orthanc-stone

changeset 8:fcff71deac7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Oct 2016 17:01:51 +0200
parents a60ff142ceb5 (current diff) d9452f5a5346 (diff)
children 4cf45e539cd9
files
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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()