From 438fff19fa3fb77c4433a05c009e5c6c6ead1dda Mon Sep 17 00:00:00 2001 From: fuzzard Date: Mon, 20 Sep 2021 17:55:05 +1000 Subject: [osx] rename SDLMain.h to XBMCApplication.h Header is generic, and will be used for nswindow based osx app --- cmake/platform/osx/osx.cmake | 2 +- cmake/scripts/osx/ArchSetup.cmake | 2 +- xbmc/platform/darwin/osx/SDL/SDLMain.mm | 2 +- xbmc/platform/darwin/osx/SDLMain.h | 13 ------------- xbmc/platform/darwin/osx/XBMCApplication.h | 13 +++++++++++++ 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 xbmc/platform/darwin/osx/SDLMain.h create mode 100644 xbmc/platform/darwin/osx/XBMCApplication.h diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake index f2d58a39c0..5f911d121e 100644 --- a/cmake/platform/osx/osx.cmake +++ b/cmake/platform/osx/osx.cmake @@ -10,7 +10,7 @@ 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/darwin/osx/SDLMain.h) + ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp) else() message(SEND_ERROR "Currently only SDL windowing is supported. Please set APP_WINDOW_SYSTEM to \"sdl\"") endif() diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake index 6066468c70..0ea19e165e 100644 --- a/cmake/scripts/osx/ArchSetup.cmake +++ b/cmake/scripts/osx/ArchSetup.cmake @@ -2,7 +2,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE) message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for osx. See ${CMAKE_SOURCE_DIR}/cmake/README.md") endif() -list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp) +list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/XBMCApplication.h) set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX) list(APPEND SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE diff --git a/xbmc/platform/darwin/osx/SDL/SDLMain.mm b/xbmc/platform/darwin/osx/SDL/SDLMain.mm index 74be33bbac..395f055b04 100644 --- a/xbmc/platform/darwin/osx/SDL/SDLMain.mm +++ b/xbmc/platform/darwin/osx/SDL/SDLMain.mm @@ -11,7 +11,7 @@ #import "platform/darwin/osx/CocoaInterface.h" #import "platform/darwin/osx/HotKeyController.h" -#import "platform/darwin/osx/SDLMain.h" +#import "platform/darwin/osx/XBMCApplication.h" #import "platform/darwin/osx/storage/OSXStorageProvider.h" #import diff --git a/xbmc/platform/darwin/osx/SDLMain.h b/xbmc/platform/darwin/osx/SDLMain.h deleted file mode 100644 index 71fea04632..0000000000 --- a/xbmc/platform/darwin/osx/SDLMain.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SDLMain.h - main entry point for our Cocoa-ized SDL app - * Initial Version: Darrell Walisser - * Non-NIB-Code & other changes: Max Horn - * - * SPDX-License-Identifier: Unlicense - * See LICENSES/README.md for more information. - */ - -#import - -@interface XBMCDelegate : NSObject -@end diff --git a/xbmc/platform/darwin/osx/XBMCApplication.h b/xbmc/platform/darwin/osx/XBMCApplication.h new file mode 100644 index 0000000000..09e80cdac5 --- /dev/null +++ b/xbmc/platform/darwin/osx/XBMCApplication.h @@ -0,0 +1,13 @@ +/* + * XBMCApplication.h + * Initial Version: Darrell Walisser + * Non-NIB-Code & other changes: Max Horn + * + * SPDX-License-Identifier: Unlicense + * See LICENSES/README.md for more information. + */ + +#import + +@interface XBMCDelegate : NSObject +@end -- cgit v1.2.3