aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2021-09-29 18:58:28 +1000
committerfuzzard <fuzzard@kodi.tv>2022-04-12 16:01:12 +0200
commit2f751c75e25a4fd106f8629b0d010391e7d22e32 (patch)
tree5f54ea23c9a54fa07a6390b5593773908c8becfb
parent9930b2522e6378675a5134edbe2698f3969a138a (diff)
[osx] relocate more SDL specific code
-rw-r--r--cmake/treedata/osx/subdirs.txt1
-rw-r--r--xbmc/platform/darwin/osx/CMakeLists.txt2
-rw-r--r--xbmc/platform/darwin/osx/SDL/CMakeLists.txt9
-rw-r--r--xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.h (renamed from xbmc/platform/darwin/osx/OSXTextInputResponder.h)0
-rw-r--r--xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.mm (renamed from xbmc/platform/darwin/osx/OSXTextInputResponder.mm)0
-rw-r--r--xbmc/windowing/osx/SDL/WinSystemOSXSDL.mm2
6 files changed, 11 insertions, 3 deletions
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index b9fc36e5cb..abc1d9036d 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
diff --git a/xbmc/platform/darwin/osx/CMakeLists.txt b/xbmc/platform/darwin/osx/CMakeLists.txt
index 3ef7dc54d6..125135b610 100644
--- a/xbmc/platform/darwin/osx/CMakeLists.txt
+++ b/xbmc/platform/darwin/osx/CMakeLists.txt
@@ -1,7 +1,6 @@
set(SOURCES CocoaInterface.mm
CPUInfoOsx.cpp
HotKeyController.m
- OSXTextInputResponder.mm
PlatformDarwinOSX.cpp
smc.c
XBMCHelper.cpp)
@@ -9,7 +8,6 @@ set(SOURCES CocoaInterface.mm
set(HEADERS CocoaInterface.h
CPUInfoOsx.h
HotKeyController.h
- OSXTextInputResponder.h
PlatformDarwinOSX.h
smc.h
XBMCHelper.h)
diff --git a/xbmc/platform/darwin/osx/SDL/CMakeLists.txt b/xbmc/platform/darwin/osx/SDL/CMakeLists.txt
new file mode 100644
index 0000000000..a9badcf8c6
--- /dev/null
+++ b/xbmc/platform/darwin/osx/SDL/CMakeLists.txt
@@ -0,0 +1,9 @@
+if(SDL_FOUND)
+ set(SOURCES OSXTextInputResponder.mm)
+
+ set(HEADERS OSXTextInputResponder.h)
+endif()
+
+if(SOURCES)
+ core_add_library(platform_osx_SDL)
+endif()
diff --git a/xbmc/platform/darwin/osx/OSXTextInputResponder.h b/xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.h
index 0448bdbd09..0448bdbd09 100644
--- a/xbmc/platform/darwin/osx/OSXTextInputResponder.h
+++ b/xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.h
diff --git a/xbmc/platform/darwin/osx/OSXTextInputResponder.mm b/xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.mm
index 0f87beb96a..0f87beb96a 100644
--- a/xbmc/platform/darwin/osx/OSXTextInputResponder.mm
+++ b/xbmc/platform/darwin/osx/SDL/OSXTextInputResponder.mm
diff --git a/xbmc/windowing/osx/SDL/WinSystemOSXSDL.mm b/xbmc/windowing/osx/SDL/WinSystemOSXSDL.mm
index 08cccfc14f..bec2de98db 100644
--- a/xbmc/windowing/osx/SDL/WinSystemOSXSDL.mm
+++ b/xbmc/windowing/osx/SDL/WinSystemOSXSDL.mm
@@ -40,7 +40,7 @@
#include "platform/darwin/DarwinUtils.h"
#include "platform/darwin/DictionaryUtils.h"
#include "platform/darwin/osx/CocoaInterface.h"
-#import "platform/darwin/osx/OSXTextInputResponder.h"
+#import "platform/darwin/osx/SDL/OSXTextInputResponder.h"
#include "platform/darwin/osx/XBMCHelper.h"
#include <cstdlib>