[osx][windowing] split SDL specific inclusion to SDL_FOUND

3 files changed, 19 insertions, 10 deletions

diff --git a/cmake/platform/osx/osx.cmake b/cmake/platform/osx/osx.cmake
index 931e568785..433ac687ce 100644
--- a/cmake/platform/osx/osx.cmake
+++ b/cmake/platform/osx/osx.cmake
@@ -1,7 +1,16 @@
 if(NOT APP_RENDER_SYSTEM OR APP_RENDER_SYSTEM STREQUAL "gl")
   list(APPEND PLATFORM_REQUIRED_DEPS OpenGl)
   set(APP_RENDER_SYSTEM gl)
+  list(APPEND SYSTEM_DEFINES -DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED)
 else()
   message(SEND_ERROR "Currently only OpenGL rendering is supported. Please set APP_RENDER_SYSTEM to \"gl\"")
 endif()
-list(APPEND PLATFORM_REQUIRED_DEPS Sdl)
\ No newline at end of file
+
+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
+                               ${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\"")
+endif()
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index 3ddd0132b5..6066468c70 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -2,14 +2,11 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
   message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for osx. See ${CMAKE_SOURCE_DIR}/cmake/README.md")
 endif()
 
-set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.mm
-                     ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/osx/SDLMain.h)
+list(APPEND CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/posix/main.cpp)
 
 set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX)
-set(SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
-                   -D__STDC_CONSTANT_MACROS
-                   -DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED)
+list(APPEND SYSTEM_DEFINES -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+                           -D__STDC_CONSTANT_MACROS)
 set(PLATFORM_DIR platform/darwin)
 set(PLATFORMDEFS_DIR platform/posix)
 set(CMAKE_SYSTEM_NAME Darwin)
@@ -29,7 +26,7 @@ endif()
 set(CMAKE_OSX_ARCHITECTURES ${CPU})
 
 # Additional SYSTEM_DEFINES
-list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
+list(APPEND SYSTEM_DEFINES -DHAS_POSIX_NETWORK -DHAS_OSX_NETWORK -DHAS_ZEROCONF)
 
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
 
diff --git a/xbmc/windowing/osx/CMakeLists.txt b/xbmc/windowing/osx/CMakeLists.txt
index bae8f6e231..1cbf3dd95d 100644
--- a/xbmc/windowing/osx/CMakeLists.txt
+++ b/xbmc/windowing/osx/CMakeLists.txt
@@ -1,16 +1,19 @@
 set(SOURCES CocoaDPMSSupport.cpp
             OSScreenSaverOSX.cpp
             WinEventsOSX.mm
-            WinEventsSDL.cpp
             WinSystemOSX.mm
             VideoSyncOsx.mm)
 set(HEADERS CocoaDPMSSupport.h
             OSScreenSaverOSX.h
             WinEventsOSX.h
-            WinEventsSDL.h
             WinSystemOSX.h
             VideoSyncOsx.h)
 
+if(SDL_FOUND)
+  list(APPEND SOURCES WinEventsSDL.cpp)
+  list(APPEND HEADERS WinEventsSDL.h)
+endif()
+
 if(OPENGL_FOUND)
   list(APPEND SOURCES WinSystemOSXGL.mm)
   list(APPEND HEADERS WinSystemOSXGL.h)