diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-09-20 17:46:42 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-09-20 17:48:12 +1000 |
| commit | 694ffcad285a04795705c7b0da7100051c9163f6 (patch) | |
| tree | 83468da54b3be3c96e00f25ab340878401572c44 | |
| parent | 519c74b1f7ba6ee1106ea3287f242e24c186d8aa (diff) | |
[osx] relocate SDLMain.mm
Relocate SDLMain to explicit SDL folder
| -rw-r--r-- | cmake/platform/osx/osx.cmake | 2 | ||||
| -rw-r--r-- | xbmc/platform/darwin/osx/SDL/SDLMain.mm (renamed from xbmc/platform/darwin/osx/SDLMain.mm) | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake index 433ac687ce..f2d58a39c0 100644 --- a/cmake/platform/osx/osx.cmake +++ b/cmake/platform/osx/osx.cmake @@ -9,7 +9,7 @@ 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/SDLMain.mm + list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDL/SDLMain.mm ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.h) else() message(SEND_ERROR "Currently only SDL windowing is supported. Please set APP_WINDOW_SYSTEM to \"sdl\"") diff --git a/xbmc/platform/darwin/osx/SDLMain.mm b/xbmc/platform/darwin/osx/SDL/SDLMain.mm index e760ebea1b..74be33bbac 100644 --- a/xbmc/platform/darwin/osx/SDLMain.mm +++ b/xbmc/platform/darwin/osx/SDL/SDLMain.mm @@ -7,12 +7,11 @@ * See LICENSES/README.md for more information. */ -#import "SDLMain.h" - #import "messaging/ApplicationMessenger.h" #import "platform/darwin/osx/CocoaInterface.h" #import "platform/darwin/osx/HotKeyController.h" +#import "platform/darwin/osx/SDLMain.h" #import "platform/darwin/osx/storage/OSXStorageProvider.h" #import <SDL/SDL.h> |