diff options
| author | enen92 <92enen@gmail.com> | 2023-03-15 16:54:13 +0000 |
|---|---|---|
| committer | Miguel Borges de Freitas <92enen@gmail.com> | 2023-10-05 14:22:39 +0100 |
| commit | 4acbf36fb0b3a977264fdc0660b955b9d1a89a95 (patch) | |
| tree | 6e3b7135d8e959666c6426e9e70718a3bc476933 /cmake | |
| parent | a83fb102601f7e64cbc5de6e94c4bea94fae8148 (diff) | |
[macOS] Drop legacy SDL windowing
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindSdl.cmake | 29 | ||||
| -rw-r--r-- | cmake/platform/osx/osx.cmake | 14 | ||||
| -rw-r--r-- | cmake/treedata/osx/subdirs.txt | 2 |
3 files changed, 2 insertions, 43 deletions
diff --git a/cmake/modules/FindSdl.cmake b/cmake/modules/FindSdl.cmake deleted file mode 100644 index 60959cb06c..0000000000 --- a/cmake/modules/FindSdl.cmake +++ /dev/null @@ -1,29 +0,0 @@ -#.rst: -# FindSDL -# ------- -# Finds the SDL library -# -# This will define the following variables:: -# -# SDL_FOUND - system has SDL -# SDL_INCLUDE_DIRS - the SDL include directory -# SDL_LIBRARIES - the SDL libraries -# SDL_DEFINITIONS - the SDL compile definitions - -if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_SDL sdl QUIET) -endif() - -find_path(SDL_INCLUDE_DIR SDL/SDL.h PATHS ${PC_SDL_INCLUDE_DIR}) -find_library(SDL_LIBRARY NAMES SDL PATHS ${PC_SDL_LIBDIR}) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Sdl REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR) - -if(SDL_FOUND) - set(SDL_LIBRARIES ${SDL_LIBRARY}) - set(SDL_INCLUDE_DIRS ${SDL_INCLUDE_DIR}) - set(SDL_DEFINITIONS -DHAVE_SDL=1) -endif() - -mark_as_advanced(SDL_LIBRARY SDL_INCLUDE_DIR) diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake index 50cea0abb7..8b581a8c1d 100644 --- a/cmake/platform/osx/osx.cmake +++ b/cmake/platform/osx/osx.cmake @@ -1,3 +1,5 @@ +list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/XBMCApplication.mm) + if(NOT APP_RENDER_SYSTEM OR APP_RENDER_SYSTEM STREQUAL "gl") list(APPEND PLATFORM_REQUIRED_DEPS OpenGl) set(APP_RENDER_SYSTEM gl) @@ -7,17 +9,5 @@ else() message(SEND_ERROR "Currently only OpenGL rendering is supported. Please set APP_RENDER_SYSTEM to \"gl\"") endif() -if(NOT APP_WINDOW_SYSTEM OR APP_WINDOW_SYSTEM STREQUAL sdl) - list(APPEND SYSTEM_DEFINES -DHAS_SDL) - list(APPEND PLATFORM_REQUIRED_DEPS Sdl) - list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDL/SDLMain.mm - ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp) -elseif(APP_WINDOW_SYSTEM STREQUAL native) - # native windowing and input - list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/XBMCApplication.mm) -else() - message(SEND_ERROR "Only SDL or native windowing options are supported.") -endif() - set(${CORE_PLATFORM_NAME_LC}_SEARCH_CONFIG NO_DEFAULT_PATH CACHE STRING "") list(APPEND PLATFORM_REQUIRED_DEPS Smctemp) diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index b56f268cae..f524d22dd3 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -7,7 +7,6 @@ xbmc/platform/darwin/osx platform/osx xbmc/platform/darwin/osx/network platform/darwin/osx/network xbmc/platform/darwin/osx/peripherals platform/osx/peripherals xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement -xbmc/platform/darwin/osx/SDL platform/osx/SDL xbmc/platform/darwin/osx/storage platform/osx/storage xbmc/platform/darwin/peripherals platform/darwin/peripherals xbmc/platform/darwin/utils platform/darwin/utils @@ -19,4 +18,3 @@ xbmc/platform/posix/threads platform/posix/threads xbmc/platform/posix/utils platform/posix/utils xbmc/windowing/osx windowing/osx xbmc/windowing/osx/OpenGL windowing/osx/OpenGL -xbmc/windowing/osx/SDL windowing/osx/SDL |