Merge pull request #16210 from lrusak/platforms-no-linux

platform/linux is for linux! (and freebsd I guess)
xbmc · Jun 3, 2019 · f064856 · f064856
2 parents 12ec642 + 44a808c
commit f064856
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 36 deletions.
diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
@@ -12,7 +12,6 @@ xbmc/platform/android/network               platform/android/network
 xbmc/platform/android/peripherals           platform/android/peripherals
 xbmc/platform/android/powermanagement       platform/android/powermanagement
 xbmc/platform/android/storage               platform/android/storage
-xbmc/platform/linux                         platform/linux
 xbmc/platform/linux/peripherals             platform/linux/peripherals
 xbmc/platform/posix                         platform/posix
 xbmc/platform/posix/filesystem              platform/posix/filesystem

diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
@@ -3,11 +3,11 @@ xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
 xbmc/input/touch                    input/touch
 xbmc/input/touch/generic            input/touch/generic
 xbmc/platform/freebsd               platform/freebsd
-xbmc/platform/linux                 platform/linux
 xbmc/platform/linux/input           platform/linux/input
 xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
+xbmc/platform/linux/sse4            platform/linux/sse4
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem

diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt
@@ -7,7 +7,6 @@ xbmc/platform/darwin/ios              platform/ios
 xbmc/platform/darwin/ios-common       platform/ios-common
 xbmc/platform/darwin/network          platform/darwin/network
 xbmc/platform/darwin/storage          platform/storage
-xbmc/platform/linux                   platform/linux
 xbmc/platform/posix                   posix
 xbmc/platform/posix/filesystem        platform/posix/filesystem
 xbmc/platform/posix/network           platform/posix/network

diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt
@@ -7,6 +7,7 @@ xbmc/platform/linux/input           platform/linux/input
 xbmc/platform/linux/network         platform/linux/network
 xbmc/platform/linux/peripherals     platform/linux/peripherals
 xbmc/platform/linux/powermanagement platform/linux/powermanagement
+xbmc/platform/linux/sse4            platform/linux/sse4
 xbmc/platform/linux/storage         platform/linux/storage
 xbmc/platform/posix                 platform/posix
 xbmc/platform/posix/filesystem      platform/posix/filesystem

diff --git a/xbmc/platform/freebsd/CMakeLists.txt b/xbmc/platform/freebsd/CMakeLists.txt
@@ -1,3 +1,22 @@
-set(SOURCES OptionalsReg.cpp)
-set(HEADERS  ../linux/OptionalsReg.h)
+set(SOURCES ../linux/OptionalsReg.cpp
+            ../linux/TimeUtils.cpp)
+
+set(HEADERS ../linux/OptionalsReg.h
+            ../linux/PlatformConstants.h
+            ../linux/TimeUtils.h)
+
+if(ALSA_FOUND)
+  list(APPEND SOURCES ../linux/FDEventMonitor.cpp)
+  list(APPEND HEADERS ../linux/FDEventMonitor.h)
+endif()
+
+if(DBUS_FOUND)
+  list(APPEND SOURCES ../linux/DBusMessage.cpp
+                      ../linux/DBusReserve.cpp
+                      ../linux/DBusUtil.cpp)
+  list(APPEND HEADERS ../linux/DBusMessage.h
+                      ../linux/DBusReserve.h
+                      ../linux/DBusUtil.h)
+endif()
+
 core_add_library(freebsdsupport)
diff --git a/xbmc/platform/freebsd/OptionalsReg.cpp b/xbmc/platform/freebsd/OptionalsReg.cpp
diff --git a/xbmc/platform/linux/CMakeLists.txt b/xbmc/platform/linux/CMakeLists.txt
@@ -28,8 +28,4 @@ if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
                       OMXCore.h)
 endif()
 
-if(HAVE_SSE4_1)
-  add_subdirectory(sse4)
-endif()
-
 core_add_library(linuxsupport)
diff --git a/xbmc/platform/linux/OptionalsReg.cpp b/xbmc/platform/linux/OptionalsReg.cpp
@@ -27,12 +27,10 @@ bool OPTIONALS::ALSARegister()
 }
 #endif
 
-#ifdef TARGET_LINUX
 bool OPTIONALS::OSSRegister()
 {
   return false;
 }
-#endif
 
 //-----------------------------------------------------------------------------
 // PulseAudio

diff --git a/xbmc/platform/linux/sse4/CMakeLists.txt b/xbmc/platform/linux/sse4/CMakeLists.txt
@@ -1,7 +1,8 @@
-set(SOURCES CopyFrame.cpp)
+if(HAVE_SSE4_1)
+  set(SOURCES CopyFrame.cpp)
+  set(HEADERS DllLibSSE4.h)
 
-set(HEADERS DllLibSSE4.h)
-
-core_add_shared_library(sse4)
-set_target_properties(sse4 PROPERTIES FOLDER lib)
-target_compile_options(sse4 PRIVATE -msse4.1)
+  core_add_shared_library(sse4)
+  set_target_properties(sse4 PROPERTIES FOLDER lib)
+  target_compile_options(sse4 PRIVATE -msse4.1)
+endif()