From 4c3251ec645c8b71820dab7e51e612e5919d4e75 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 23 Jul 2017 16:59:43 +0200 Subject: sync with upstream --- cmake/treedata/android/subdirs.txt | 2 +- cmake/treedata/common/games.txt | 1 + cmake/treedata/common/subdirs.txt | 6 +++++- cmake/treedata/ios/subdirs.txt | 1 + cmake/treedata/linux/subdirs.txt | 2 +- cmake/treedata/optional/common/X.txt | 1 + cmake/treedata/optional/common/gbm.txt | 1 + cmake/treedata/osx/subdirs.txt | 1 + cmake/treedata/rbpi/omxplayer.txt | 1 - cmake/treedata/rbpi/subdirs.txt | 12 ------------ cmake/treedata/windows/subdirs.txt | 1 + 11 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 cmake/treedata/optional/common/gbm.txt delete mode 100644 cmake/treedata/rbpi/omxplayer.txt delete mode 100644 cmake/treedata/rbpi/subdirs.txt (limited to 'cmake/treedata') diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt index e175b6d..0733201 100644 --- a/cmake/treedata/android/subdirs.txt +++ b/cmake/treedata/android/subdirs.txt @@ -2,6 +2,7 @@ xbmc/linux linuxsupport 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 @@ -12,4 +13,3 @@ xbmc/windowing/android windowing/android xbmc/platform/posix posix xbmc/platform/android/activity android_activity xbmc/platform/android/bionic_supplement android_bionicsupplement -xbmc/platform/android/loader android_loader diff --git a/cmake/treedata/common/games.txt b/cmake/treedata/common/games.txt index 03d42bc..b2faead 100644 --- a/cmake/treedata/common/games.txt +++ b/cmake/treedata/common/games.txt @@ -7,6 +7,7 @@ xbmc/games/controllers/dialogs games/controllers/dialogs xbmc/games/controllers/guicontrols games/controllers/guicontrols xbmc/games/controllers/windows games/controllers/windows xbmc/games/dialogs games/dialogs +xbmc/games/dialogs/osd games/dialogs/osd xbmc/games/ports games/ports xbmc/games/tags games/tags xbmc/games/windows games/windows diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt index 5a25afe..ee4e83c 100644 --- a/cmake/treedata/common/subdirs.txt +++ b/cmake/treedata/common/subdirs.txt @@ -1,8 +1,11 @@ xbmc xbmc xbmc/addons addons +xbmc/addons/binary-addons addons_binary-addons xbmc/addons/interfaces addonsBinaryInterfaces xbmc/addons/interfaces/Addon addonCallbacks_Addon -xbmc/addons/interfaces/GUI addonCallbacks_GUI +xbmc/addons/interfaces/GUI addons_interfaces_gui +xbmc/addons/interfaces/GUI/controls addons_interfaces_gui_controls +xbmc/addons/interfaces/GUI/dialogs addons_interfaces_gui_dialogs xbmc/addons/settings addonsSettings xbmc/commons commons xbmc/dbwrappers dbwrappers @@ -13,6 +16,7 @@ xbmc/input input xbmc/input/joysticks input/joysticks xbmc/input/joysticks/dialogs input/joysticks/dialogs xbmc/input/joysticks/generic input/joysticks/generic +xbmc/input/joysticks/keymaps input/joysticks/keymaps xbmc/input/keyboard input/keyboard xbmc/input/keyboard/generic input/keyboard/generic xbmc/input/mouse input/mouse diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt index b681ed5..4bbeeb1 100644 --- a/cmake/treedata/ios/subdirs.txt +++ b/cmake/treedata/ios/subdirs.txt @@ -13,3 +13,4 @@ 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/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt index 2dc8045..1ed11f5 100644 --- a/cmake/treedata/linux/subdirs.txt +++ b/cmake/treedata/linux/subdirs.txt @@ -1,5 +1,4 @@ xbmc/linux linuxsupport -xbmc/linux/sse4 sse4 xbmc/input/linux input/linux xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic @@ -11,3 +10,4 @@ xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix xbmc/windowing/egl windowing/egl xbmc/platform/posix posix +xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/optional/common/X.txt index 617ff40..26b8a90 100644 --- a/cmake/treedata/optional/common/X.txt +++ b/cmake/treedata/optional/common/X.txt @@ -1 +1,2 @@ xbmc/windowing/X11 windowing/X11 # X +xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt new file mode 100644 index 0000000..1adde93 --- /dev/null +++ b/cmake/treedata/optional/common/gbm.txt @@ -0,0 +1 @@ +xbmc/windowing/gbm windowing/gbm # GBM diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index f0fc5c5..a520243 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -10,3 +10,4 @@ xbmc/platform/darwin/osx platform_osx xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix xbmc/windowing/osx windowing/osx +xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx diff --git a/cmake/treedata/rbpi/omxplayer.txt b/cmake/treedata/rbpi/omxplayer.txt deleted file mode 100644 index d56f1df..0000000 --- a/cmake/treedata/rbpi/omxplayer.txt +++ /dev/null @@ -1 +0,0 @@ -xbmc/cores/omxplayer cores/omxplayer diff --git a/cmake/treedata/rbpi/subdirs.txt b/cmake/treedata/rbpi/subdirs.txt deleted file mode 100644 index c98652a..0000000 --- a/cmake/treedata/rbpi/subdirs.txt +++ /dev/null @@ -1,12 +0,0 @@ -xbmc/linux linuxsupport -xbmc/input/linux input/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/powermanagement/linux powermanagement/linux -xbmc/storage/linux storage/linux -xbmc/filesystem/posix filesystem/posix -xbmc/utils/posix utils_posix -xbmc/platform/posix posix -xbmc/windowing/rpi windowing/rpi # EGL diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt index e52d2f6..bdbbe1d 100644 --- a/cmake/treedata/windows/subdirs.txt +++ b/cmake/treedata/windows/subdirs.txt @@ -12,3 +12,4 @@ xbmc/utils/win32 utils_win32 xbmc/rendering/dx rendering_dx xbmc/threads/platform/win threads_win xbmc/windowing/windows windowing/windows +xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows -- cgit v1.2.3