diff options
16 files changed, 10 insertions, 10 deletions
diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt index c2c7b2eb0b..94342b4113 100644 --- a/cmake/treedata/android/subdirs.txt +++ b/cmake/treedata/android/subdirs.txt @@ -2,7 +2,6 @@ xbmc/cores/RetroPlayer/process/android cores/RetroPlayer/process/android xbmc/platform/linux platform/linux xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic -xbmc/network/linux network/linux xbmc/peripherals/bus/linux peripherals/bus/linux xbmc/peripherals/bus/android peripherals/bus/android xbmc/powermanagement/android powermanagement/android @@ -10,6 +9,7 @@ xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix xbmc/windowing/android windowing/android xbmc/platform/posix posix +xbmc/platform/linux/network platform/linux/network xbmc/platform/android/activity android_activity xbmc/platform/android/bionic_supplement android_bionicsupplement xbmc/platform/android/network platform/android/network diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt index c4cc776464..58139267a8 100644 --- a/cmake/treedata/freebsd/subdirs.txt +++ b/cmake/treedata/freebsd/subdirs.txt @@ -1,9 +1,9 @@ xbmc/platform/linux platform/linux xbmc/platform/linux/input platform/linux/input +xbmc/platform/linux/network platform/linux/network xbmc/platform/linux/storage platform/linux/storage xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic -xbmc/network/linux network/linux xbmc/peripherals/bus/linux peripherals/bus/linux xbmc/powermanagement/linux powermanagement/linux xbmc/filesystem/posix filesystem/posix diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt index feafe5480a..652854cbb0 100644 --- a/cmake/treedata/ios/subdirs.txt +++ b/cmake/treedata/ios/subdirs.txt @@ -1,7 +1,7 @@ xbmc/platform/linux platform/linux +xbmc/platform/linux/network platform/linux/network xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic -xbmc/network/linux network/linux xbmc/network/osx network/osx xbmc/peripherals/bus/osx peripherals/bus/osx xbmc/powermanagement/osx powermanagement/osx diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt index 6dc55fe4e7..9385000e86 100644 --- a/cmake/treedata/linux/subdirs.txt +++ b/cmake/treedata/linux/subdirs.txt @@ -1,9 +1,9 @@ xbmc/platform/linux platform/linux xbmc/platform/linux/input platform/linux/input +xbmc/platform/linux/network platform/linux/network xbmc/platform/linux/storage platform/linux/storage xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic -xbmc/network/linux network/linux xbmc/peripherals/bus/linux peripherals/bus/linux xbmc/powermanagement/linux powermanagement/linux xbmc/filesystem/posix filesystem/posix diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index de61ea4940..c58921d2af 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -1,5 +1,5 @@ xbmc/platform/linux platform/linux -xbmc/network/linux network/linux +xbmc/platform/linux/network platform/linux/network xbmc/network/osx network/osx xbmc/peripherals/bus/osx peripherals/bus/osx xbmc/powermanagement/osx powermanagement/osx diff --git a/xbmc/network/GUIDialogAccessPoints.cpp b/xbmc/network/GUIDialogAccessPoints.cpp index db7cd68204..1d646e2e7b 100644 --- a/xbmc/network/GUIDialogAccessPoints.cpp +++ b/xbmc/network/GUIDialogAccessPoints.cpp @@ -23,7 +23,7 @@ #if defined(TARGET_ANDROID) #include "platform/android/network/NetworkAndroid.h" #elif defined(TARGET_POSIX) -#include "linux/NetworkLinux.h" +#include "platform/linux/network/NetworkLinux.h" #endif #include "ServiceBroker.h" #include "FileItem.h" diff --git a/xbmc/network/Network.h b/xbmc/network/Network.h index 0e161907a3..d970a83cb5 100644 --- a/xbmc/network/Network.h +++ b/xbmc/network/Network.h @@ -155,7 +155,7 @@ public: #if defined(TARGET_ANDROID) #include "platform/android/network/NetworkAndroid.h" #elif defined(HAS_LINUX_NETWORK) -#include "linux/NetworkLinux.h" +#include "platform/linux/network/NetworkLinux.h" #elif defined(HAS_WIN32_NETWORK) #include "platform/win32/network/NetworkWin32.h" #elif defined(HAS_WIN10_NETWORK) diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp index 18b8b04f52..e86c4ea001 100644 --- a/xbmc/network/Zeroconf.cpp +++ b/xbmc/network/Zeroconf.cpp @@ -29,7 +29,7 @@ #include "utils/JobManager.h" #if defined(HAS_AVAHI) -#include "linux/ZeroconfAvahi.h" +#include "platform/linux/network/ZeroconfAvahi.h" #elif defined(TARGET_DARWIN) //on osx use the native implementation #include "osx/ZeroconfOSX.h" diff --git a/xbmc/network/ZeroconfBrowser.cpp b/xbmc/network/ZeroconfBrowser.cpp index d568d1dc52..125e7aa597 100644 --- a/xbmc/network/ZeroconfBrowser.cpp +++ b/xbmc/network/ZeroconfBrowser.cpp @@ -23,7 +23,7 @@ #include <cassert> #if defined (HAS_AVAHI) -#include "linux/ZeroconfBrowserAvahi.h" +#include "platform/linux/network/ZeroconfBrowserAvahi.h" #elif defined(TARGET_DARWIN) //on osx use the native implementation #include "osx/ZeroconfBrowserOSX.h" diff --git a/xbmc/network/linux/CMakeLists.txt b/xbmc/platform/linux/network/CMakeLists.txt index 3efb0f415c..9a99ed1c20 100644 --- a/xbmc/network/linux/CMakeLists.txt +++ b/xbmc/platform/linux/network/CMakeLists.txt @@ -9,4 +9,4 @@ if(AVAHI_FOUND) ZeroconfBrowserAvahi.h) endif() -core_add_library(network_linux) +core_add_library(platform_linux_network) diff --git a/xbmc/network/linux/NetworkLinux.cpp b/xbmc/platform/linux/network/NetworkLinux.cpp index 9771763818..9771763818 100644 --- a/xbmc/network/linux/NetworkLinux.cpp +++ b/xbmc/platform/linux/network/NetworkLinux.cpp diff --git a/xbmc/network/linux/NetworkLinux.h b/xbmc/platform/linux/network/NetworkLinux.h index 031e6f058c..031e6f058c 100644 --- a/xbmc/network/linux/NetworkLinux.h +++ b/xbmc/platform/linux/network/NetworkLinux.h diff --git a/xbmc/network/linux/ZeroconfAvahi.cpp b/xbmc/platform/linux/network/ZeroconfAvahi.cpp index 492e5829a9..492e5829a9 100644 --- a/xbmc/network/linux/ZeroconfAvahi.cpp +++ b/xbmc/platform/linux/network/ZeroconfAvahi.cpp diff --git a/xbmc/network/linux/ZeroconfAvahi.h b/xbmc/platform/linux/network/ZeroconfAvahi.h index 86fd49e59e..86fd49e59e 100644 --- a/xbmc/network/linux/ZeroconfAvahi.h +++ b/xbmc/platform/linux/network/ZeroconfAvahi.h diff --git a/xbmc/network/linux/ZeroconfBrowserAvahi.cpp b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp index e20772a4c6..e20772a4c6 100644 --- a/xbmc/network/linux/ZeroconfBrowserAvahi.cpp +++ b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.cpp diff --git a/xbmc/network/linux/ZeroconfBrowserAvahi.h b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h index 49a775fa94..49a775fa94 100644 --- a/xbmc/network/linux/ZeroconfBrowserAvahi.h +++ b/xbmc/platform/linux/network/ZeroconfBrowserAvahi.h |