diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2022-04-16 22:00:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-16 22:00:51 +1000 |
| commit | adcff918bc783d3b0f57aa8a4c41d79d76f8f5ea (patch) | |
| tree | c6e4c6964eec601b136fad0f2e7b52bccdde2ae7 /cmake | |
| parent | f051b8d2e1b3a3d02054c1e77ac4ff9fd7b88529 (diff) | |
| parent | ba9d5b1be195dff3a5bc3bd9fd68742e569d6237 (diff) | |
Merge pull request #20200 from fuzzard/osx_nativeSDL
[Osx] native windowing/input implementation
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/platform/osx/osx.cmake | 5 | ||||
| -rw-r--r-- | cmake/treedata/osx/subdirs.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake index 5f911d121e..72977de318 100644 --- a/cmake/platform/osx/osx.cmake +++ b/cmake/platform/osx/osx.cmake @@ -11,6 +11,9 @@ if(NOT APP_WINDOW_SYSTEM OR APP_WINDOW_SYSTEM STREQUAL 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 "Currently only SDL windowing is supported. Please set APP_WINDOW_SYSTEM to \"sdl\"") + message(SEND_ERROR "Only SDL or native windowing options are supported.") endif() diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index b9fc36e5cb..9bee62332f 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -6,6 +6,7 @@ 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 @@ -16,4 +17,5 @@ xbmc/platform/posix/storage/discs platform/posix/storage/discs 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 |