CMakeLists.txt
changeset 11324 670978408a10
parent 11323 46861f3fc187
child 11326 ba4fe3686323
     1.1 --- a/CMakeLists.txt	Fri Aug 18 20:00:29 2017 -0400
     1.2 +++ b/CMakeLists.txt	Fri Aug 18 20:25:14 2017 -0400
     1.3 @@ -1320,7 +1320,16 @@
     1.4      list(APPEND SDL_LIBS "-lmingw32" "-lSDL2main" "-mwindows")
     1.5    endif()
     1.6  elseif(APPLE)
     1.7 -  # TODO: rework this for proper MacOS X, iOS and Darwin support
     1.8 +  # TODO: rework this all for proper MacOS X, iOS and Darwin support
     1.9 +
    1.10 +  # We always need these libs on macOS at the moment.
    1.11 +  # !!! FIXME: we need Carbon for some very old API calls in
    1.12 +  # !!! FIXME:  src/video/cocoa/SDL_cocoakeyboard.c, but we should figure out
    1.13 +  # !!! FIXME:  how to dump those.
    1.14 +  if (APPLE AND NOT IOS)
    1.15 +    set(SDL_FRAMEWORK_COCOA 1)
    1.16 +    set(SDL_FRAMEWORK_CARBON 1)
    1.17 +  endif()
    1.18  
    1.19    # Requires the darwin file implementation
    1.20    if(SDL_FILE)
    1.21 @@ -1329,7 +1338,7 @@
    1.22      # !!! FIXME: modern CMake doesn't need "LANGUAGE C" for Objective-C.
    1.23      set_source_files_properties(${EXTRA_SOURCES} PROPERTIES LANGUAGE C)
    1.24      set(HAVE_SDL_FILE TRUE)
    1.25 -    set(SDL_FRAMEWORK_COCOA 1)
    1.26 +    # !!! FIXME: why is COREVIDEO inside this if() block?
    1.27      set(SDL_FRAMEWORK_COREVIDEO 1)
    1.28    else()
    1.29      message_error("SDL_FILE must be enabled to build on MacOS X")
    1.30 @@ -1383,7 +1392,6 @@
    1.31      endif()
    1.32      set(SOURCE_FILES ${SOURCE_FILES} ${POWER_SOURCES})
    1.33      set(HAVE_SDL_POWER TRUE)
    1.34 -    set(SDL_FRAMEWORK_CARBON 1)
    1.35      set(SDL_FRAMEWORK_IOKIT 1)
    1.36    endif()
    1.37