diff options
author | Anton Fedchin <anightik@gmail.com> | 2018-04-03 18:26:14 +0300 |
---|---|---|
committer | Anton Fedchin <anightik@gmail.com> | 2018-04-04 12:23:45 +0300 |
commit | 7fbeeed1a120d11b14ae56f2d563f45621832b7d (patch) | |
tree | 7e1c5eb1463696b1215b704bcc90f9c888da5678 | |
parent | bf3fdfc10bee113a1aef0d58ba2f8cc152c8f73b (diff) |
[darwin] network: move implementation to platform folder.
-rw-r--r-- | cmake/treedata/ios/subdirs.txt | 2 | ||||
-rw-r--r-- | cmake/treedata/osx/subdirs.txt | 2 | ||||
-rw-r--r-- | xbmc/network/Zeroconf.cpp | 2 | ||||
-rw-r--r-- | xbmc/network/ZeroconfBrowser.cpp | 2 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/CMakeLists.txt (renamed from xbmc/network/osx/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp (renamed from xbmc/network/osx/ZeroconfBrowserOSX.cpp) | 0 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h (renamed from xbmc/network/osx/ZeroconfBrowserOSX.h) | 0 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp (renamed from xbmc/network/osx/ZeroconfOSX.cpp) | 0 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/ZeroconfOSX.h (renamed from xbmc/network/osx/ZeroconfOSX.h) | 0 | ||||
-rw-r--r-- | xbmc/platform/darwin/osx/network/ioshacks.h (renamed from xbmc/network/osx/ioshacks.h) | 0 | ||||
-rw-r--r-- | xbmc/platform/linux/network/NetworkLinux.cpp | 2 |
11 files changed, 6 insertions, 6 deletions
diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt index 652854cbb0..5ac22d903c 100644 --- a/cmake/treedata/ios/subdirs.txt +++ b/cmake/treedata/ios/subdirs.txt @@ -2,13 +2,13 @@ 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/osx network/osx xbmc/peripherals/bus/osx peripherals/bus/osx xbmc/powermanagement/osx powermanagement/osx xbmc/platform/posix posix xbmc/platform/darwin platform/darwin xbmc/platform/darwin/ios platform/ios xbmc/platform/darwin/ios-common platform/ios-common +xbmc/platform/darwin/osx/network platform/osx/network xbmc/platform/darwin/osx/storage platform/osx/storage xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils/posix diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index c58921d2af..53e2608e3a 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -1,11 +1,11 @@ xbmc/platform/linux platform/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 xbmc/platform/posix posix xbmc/platform/darwin platform/darwin xbmc/platform/darwin/osx platform/osx +xbmc/platform/darwin/osx/network platform/osx/network xbmc/platform/darwin/osx/storage platform/osx/storage xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils/posix diff --git a/xbmc/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp index e86c4ea001..b0c1b54575 100644 --- a/xbmc/network/Zeroconf.cpp +++ b/xbmc/network/Zeroconf.cpp @@ -32,7 +32,7 @@ #include "platform/linux/network/ZeroconfAvahi.h" #elif defined(TARGET_DARWIN) //on osx use the native implementation -#include "osx/ZeroconfOSX.h" +#include "platform/darwin/osx/network/ZeroconfOSX.h" #elif defined(TARGET_ANDROID) #include "platform/android/network/ZeroconfAndroid.h" #elif defined(HAS_MDNS) diff --git a/xbmc/network/ZeroconfBrowser.cpp b/xbmc/network/ZeroconfBrowser.cpp index 125e7aa597..a89e0151a1 100644 --- a/xbmc/network/ZeroconfBrowser.cpp +++ b/xbmc/network/ZeroconfBrowser.cpp @@ -26,7 +26,7 @@ #include "platform/linux/network/ZeroconfBrowserAvahi.h" #elif defined(TARGET_DARWIN) //on osx use the native implementation -#include "osx/ZeroconfBrowserOSX.h" +#include "platform/darwin/osx/network/ZeroconfBrowserOSX.h" #elif defined(TARGET_ANDROID) #include "platform/android/network/ZeroconfBrowserAndroid.h" #elif defined(HAS_MDNS) diff --git a/xbmc/network/osx/CMakeLists.txt b/xbmc/platform/darwin/osx/network/CMakeLists.txt index 89d83b4108..e0219bbea4 100644 --- a/xbmc/network/osx/CMakeLists.txt +++ b/xbmc/platform/darwin/osx/network/CMakeLists.txt @@ -5,4 +5,4 @@ set(HEADERS ioshacks.h ZeroconfBrowserOSX.h ZeroconfOSX.h) -core_add_library(network_osx) +core_add_library(platform_osx_network) diff --git a/xbmc/network/osx/ZeroconfBrowserOSX.cpp b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp index 103e88ae82..103e88ae82 100644 --- a/xbmc/network/osx/ZeroconfBrowserOSX.cpp +++ b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.cpp diff --git a/xbmc/network/osx/ZeroconfBrowserOSX.h b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h index 304f7320af..304f7320af 100644 --- a/xbmc/network/osx/ZeroconfBrowserOSX.h +++ b/xbmc/platform/darwin/osx/network/ZeroconfBrowserOSX.h diff --git a/xbmc/network/osx/ZeroconfOSX.cpp b/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp index 12832a074e..12832a074e 100644 --- a/xbmc/network/osx/ZeroconfOSX.cpp +++ b/xbmc/platform/darwin/osx/network/ZeroconfOSX.cpp diff --git a/xbmc/network/osx/ZeroconfOSX.h b/xbmc/platform/darwin/osx/network/ZeroconfOSX.h index 46a9e04ec9..46a9e04ec9 100644 --- a/xbmc/network/osx/ZeroconfOSX.h +++ b/xbmc/platform/darwin/osx/network/ZeroconfOSX.h diff --git a/xbmc/network/osx/ioshacks.h b/xbmc/platform/darwin/osx/network/ioshacks.h index 35fec226dc..35fec226dc 100644 --- a/xbmc/network/osx/ioshacks.h +++ b/xbmc/platform/darwin/osx/network/ioshacks.h diff --git a/xbmc/platform/linux/network/NetworkLinux.cpp b/xbmc/platform/linux/network/NetworkLinux.cpp index 9771763818..13d973f18c 100644 --- a/xbmc/platform/linux/network/NetworkLinux.cpp +++ b/xbmc/platform/linux/network/NetworkLinux.cpp @@ -45,7 +45,7 @@ #include <net/route.h> #include <netinet/if_ether.h> #else //IOS - #include "network/osx/ioshacks.h" + #include "platform/darwin/osx/network/ioshacks.h" #endif #include <ifaddrs.h> #elif defined(TARGET_FREEBSD) |