From b3d195f0188758a14875a5a2f270e4fd190a679f Mon Sep 17 00:00:00 2001 From: manuel Date: Tue, 17 Apr 2018 00:15:38 +0200 Subject: sync with upstream --- cmake/treedata/android/subdirs.txt | 25 ++++++++++++------------ cmake/treedata/common/games.txt | 2 ++ cmake/treedata/common/retroplayer.txt | 3 ++- cmake/treedata/common/subdirs.txt | 2 +- cmake/treedata/freebsd/subdirs.txt | 23 +++++++++++----------- cmake/treedata/ios/subdirs.txt | 34 ++++++++++++++++----------------- cmake/treedata/linux/subdirs.txt | 24 +++++++++++------------ cmake/treedata/osx/subdirs.txt | 28 +++++++++++++-------------- cmake/treedata/windows/subdirs.txt | 28 +++++++++++++-------------- cmake/treedata/windowsstore/subdirs.txt | 29 ++++++++++++++-------------- 10 files changed, 100 insertions(+), 98 deletions(-) (limited to 'cmake/treedata') diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt index b56618a..7f7fef5 100644 --- a/cmake/treedata/android/subdirs.txt +++ b/cmake/treedata/android/subdirs.txt @@ -1,16 +1,17 @@ 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/network/android network/android -xbmc/peripherals/bus/linux peripherals/bus/linux -xbmc/peripherals/bus/android peripherals/bus/android -xbmc/powermanagement/android powermanagement/android -xbmc/storage/android storage/android -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix xbmc/windowing/android windowing/android -xbmc/platform/posix posix -xbmc/platform/android/activity android_activity -xbmc/platform/android/bionic_supplement android_bionicsupplement +xbmc/platform/posix platform/posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils +xbmc/platform/linux platform/linux +xbmc/platform/linux/network platform/linux/network +xbmc/platform/linux/peripherals platform/linux/peripherals +xbmc/platform/android/activity platform/android/activity +xbmc/platform/android/bionic_supplement platform/android/bionicsupplement +xbmc/platform/android/filesystem platform/android/filesystem +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 diff --git a/cmake/treedata/common/games.txt b/cmake/treedata/common/games.txt index b2faead..7b63f6a 100644 --- a/cmake/treedata/common/games.txt +++ b/cmake/treedata/common/games.txt @@ -1,10 +1,12 @@ xbmc/games games xbmc/games/addons games/addons +xbmc/games/addons/input games/addons/input xbmc/games/addons/playback games/addons/playback xbmc/games/addons/savestates games/addons/savestates xbmc/games/controllers games/controllers xbmc/games/controllers/dialogs games/controllers/dialogs xbmc/games/controllers/guicontrols games/controllers/guicontrols +xbmc/games/controllers/types games/controllers/types xbmc/games/controllers/windows games/controllers/windows xbmc/games/dialogs games/dialogs xbmc/games/dialogs/osd games/dialogs/osd diff --git a/cmake/treedata/common/retroplayer.txt b/cmake/treedata/common/retroplayer.txt index 97e27b3..0239801 100644 --- a/cmake/treedata/common/retroplayer.txt +++ b/cmake/treedata/common/retroplayer.txt @@ -1,7 +1,8 @@ xbmc/cores/RetroPlayer cores/RetroPlayer +xbmc/cores/RetroPlayer/guibridge cores/RetroPlayer/guibridge xbmc/cores/RetroPlayer/guicontrols cores/RetroPlayer/guicontrols +xbmc/cores/RetroPlayer/guiwindows cores/RetroPlayer/guiwindows xbmc/cores/RetroPlayer/process cores/RetroPlayer/process xbmc/cores/RetroPlayer/rendering cores/RetroPlayer/rendering xbmc/cores/RetroPlayer/rendering/VideoRenderers cores/RetroPlayer/rendering/VideoRenderers xbmc/cores/RetroPlayer/rendering/VideoShaders cores/RetroPlayer/rendering/VideoShaders -xbmc/cores/RetroPlayer/windows cores/RetroPlayer/windows diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt index d5412b5..368f473 100644 --- a/cmake/treedata/common/subdirs.txt +++ b/cmake/treedata/common/subdirs.txt @@ -17,8 +17,8 @@ xbmc/commons commons xbmc/dbwrappers dbwrappers xbmc/dialogs dialogs xbmc/favourites favourites -xbmc/guiinfo guiinfo xbmc/guilib guilib +xbmc/guilib/guiinfo guilib_guiinfo xbmc/input input xbmc/input/joysticks input/joysticks xbmc/input/joysticks/dialogs input/joysticks/dialogs diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt index f7651ee..fe0725c 100644 --- a/cmake/treedata/freebsd/subdirs.txt +++ b/cmake/treedata/freebsd/subdirs.txt @@ -1,12 +1,11 @@ -xbmc/platform/linux platform/linux -xbmc/platform/linux/input platform/linux/input -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/storage/linux storage/linux -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/platform/posix posix -xbmc/freebsd freebsdsupport +xbmc/platform/posix platform/posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils +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/storage platform/linux/storage +xbmc/input/touch input/touch +xbmc/input/touch/generic input/touch/generic diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt index 00f5cf1..a287418 100644 --- a/cmake/treedata/ios/subdirs.txt +++ b/cmake/treedata/ios/subdirs.txt @@ -1,17 +1,17 @@ -xbmc/platform/linux platform/linux -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 -xbmc/storage/osx storage/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/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/windowing/osx windowing/osx -xbmc/cores/RetroPlayer/process/ios cores/RetroPlayer/process/ios -xbmc/cores/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios +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/platform/posix posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils +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/peripherals platform/osx/peripherals +xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement +xbmc/platform/darwin/osx/storage platform/osx/storage +xbmc/windowing/osx windowing/osx +xbmc/cores/RetroPlayer/process/ios cores/RetroPlayer/process/ios +xbmc/cores/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt index b310b53..6e1d013 100644 --- a/cmake/treedata/linux/subdirs.txt +++ b/cmake/treedata/linux/subdirs.txt @@ -1,14 +1,14 @@ -xbmc/platform/linux platform/linux -xbmc/platform/linux/input platform/linux/input -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/storage/linux storage/linux -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/platform/posix posix +xbmc/platform/posix platform/posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils +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/storage platform/linux/storage +xbmc/input/touch input/touch +xbmc/input/touch/generic input/touch/generic xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi -xbmc/windowing/linux windowing/linux +xbmc/windowing/linux windowing/linux diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index 5b1b302..166a966 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -1,14 +1,14 @@ -xbmc/platform/linux platform/linux -xbmc/network/linux network/linux -xbmc/network/osx network/osx -xbmc/peripherals/bus/osx peripherals/bus/osx -xbmc/powermanagement/osx powermanagement/osx -xbmc/storage/osx storage/osx -xbmc/platform/posix posix -xbmc/platform/darwin platform_darwin -xbmc/platform/darwin/osx platform_osx -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/windowing/osx windowing/osx -xbmc/cores/RetroPlayer/process/osx cores/RetroPlayer/process/osx -xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx +xbmc/platform/posix posix +xbmc/platform/posix/filesystem platform/posix/filesystem +xbmc/platform/posix/utils platform/posix/utils +xbmc/platform/linux platform/linux +xbmc/platform/linux/network platform/linux/network +xbmc/platform/darwin platform/darwin +xbmc/platform/darwin/osx platform/osx +xbmc/platform/darwin/osx/network platform/osx/network +xbmc/platform/darwin/osx/peripherals platform/osx/peripherals +xbmc/platform/darwin/osx/powermanagement platform/darwin/osx/powermanagement +xbmc/platform/darwin/osx/storage platform/osx/storage +xbmc/windowing/osx windowing/osx +xbmc/cores/RetroPlayer/process/osx cores/RetroPlayer/process/osx +xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt index 8344320..a2c8c29 100644 --- a/cmake/treedata/windows/subdirs.txt +++ b/cmake/treedata/windows/subdirs.txt @@ -1,17 +1,17 @@ -xbmc/platform/win32 platform_win32 -xbmc/input/windows input/windows -xbmc/input/touch input/touch -xbmc/input/touch/generic input/touch/generic -xbmc/network/windows network/windows -xbmc/network/mdns network/mdns -xbmc/peripherals/bus/win32 peripherals/bus/win32 -xbmc/powermanagement/windows powermanagement/windows -xbmc/storage/windows storage/windows -xbmc/filesystem/win32 filesystem/win32 -xbmc/utils/win32 utils_win32 -xbmc/rendering/dx rendering_dx -xbmc/threads/platform/win threads_win -xbmc/windowing/windows windowing/windows +xbmc/platform/win32 platform/win32 +xbmc/platform/win32/input platform/win32/input +xbmc/platform/win32/filesystem platform/win32/filesystem +xbmc/platform/win32/network platform/win32/network +xbmc/platform/win32/peripherals platform/win32/peripherals +xbmc/platform/win32/powermanagement platform/win32/powermanagement +xbmc/platform/win32/storage platform/win32/storage +xbmc/platform/win32/utils platform/win32/utils +xbmc/input/touch input/touch +xbmc/input/touch/generic input/touch/generic +xbmc/network/mdns network/mdns +xbmc/rendering/dx rendering/dx +xbmc/threads/platform/win threads/win +xbmc/windowing/windows windowing/windows xbmc/cores/RetroPlayer/process/windows cores/RetroPlayer/process/windows xbmc/cores/RetroPlayer/rendering/VideoShaders/windows cores/RetroPlayer/rendering/VideoShaders/windows xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt index 84150d5..604be08 100644 --- a/cmake/treedata/windowsstore/subdirs.txt +++ b/cmake/treedata/windowsstore/subdirs.txt @@ -1,16 +1,15 @@ -xbmc/platform/win10 platform_win10 -xbmc/input/windows input/windows -xbmc/input/touch input/touch -xbmc/input/touch/generic input/touch/generic -xbmc/network/win10 network/win10 -xbmc/network/mdns network/mdns -xbmc/peripherals/bus/win10 peripherals/bus/win10 -xbmc/powermanagement/win10 powermanagement/win10 -xbmc/storage/win10 storage/win10 -xbmc/filesystem/win32 filesystem/win32 -xbmc/filesystem/win10 filesystem/win10 -xbmc/utils/win32 utils_win32 -xbmc/rendering/dx rendering_dx -xbmc/threads/platform/win threads_win -xbmc/windowing/win10 windowing/win10 +xbmc/platform/win10 platform/win10 +xbmc/platform/win10/filesystem platform/win10/filesystem +xbmc/platform/win10/network platform/win10/network +xbmc/platform/win10/peripherals platform/win10/peripherals +xbmc/platform/win10/powermanagement platfrom/win10/powermanagement +xbmc/platform/win10/storage platfrom/win10/storage +xbmc/platform/win32/filesystem platform/win32/filesystem +xbmc/platform/win32/utils platform/win32/utils +xbmc/input/touch input/touch +xbmc/input/touch/generic input/touch/generic +xbmc/network/mdns network/mdns +xbmc/rendering/dx rendering/dx +xbmc/threads/platform/win threads/win +xbmc/windowing/win10 windowing/win10 xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows -- cgit v1.2.3