From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Mon, 1 Jan 2018 13:40:09 +0100
Subject: sync with upstream

---
 cmake/treedata/common/music.txt       |  1 +
 cmake/treedata/common/retroplayer.txt |  4 ++++
 cmake/treedata/common/subdirs.txt     | 14 +++++++++++---
 cmake/treedata/common/video.txt       |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'cmake/treedata/common')

diff --git a/cmake/treedata/common/music.txt b/cmake/treedata/common/music.txt
index 71f30e1..29aae7b 100644
--- a/cmake/treedata/common/music.txt
+++ b/cmake/treedata/common/music.txt
@@ -1,5 +1,6 @@
 xbmc/music             music
 xbmc/music/dialogs     music/dialogs
 xbmc/music/infoscanner music/infoscanner
+xbmc/music/jobs        music/jobs
 xbmc/music/tags        music/tags
 xbmc/music/windows     music/windows
diff --git a/cmake/treedata/common/retroplayer.txt b/cmake/treedata/common/retroplayer.txt
index ab18c3c..97e27b3 100644
--- a/cmake/treedata/common/retroplayer.txt
+++ b/cmake/treedata/common/retroplayer.txt
@@ -1,3 +1,7 @@
 xbmc/cores/RetroPlayer                                          cores/RetroPlayer
 xbmc/cores/RetroPlayer/guicontrols                              cores/RetroPlayer/guicontrols
+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 ee4e83c..d5412b5 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -1,16 +1,23 @@
 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                          addons_interfaces
+xbmc/addons/interfaces/Addon                    addons_interfaces_addon
 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/addons/kodi-addon-dev-kit/include/kodi     addons_kodi-addon-dev-kit_include_kodi
+xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance addons_kodi-addon-dev-kit_include_kodi_addon-instance
+xbmc/addons/kodi-addon-dev-kit/include/kodi/gui addons_kodi-addon-dev-kit_include_kodi_gui
+xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/controls addons_kodi-addon-dev-kit_include_kodi_gui_controls
+xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs addons_kodi-addon-dev-kit_include_kodi_gui_dialogs
+xbmc/addons/kodi-addon-dev-kit/include/kodi/tools addons_kodi-addon-dev-kit_include_kodi_tools
+xbmc/addons/settings                            addons_settings
 xbmc/commons                                    commons
 xbmc/dbwrappers                                 dbwrappers
 xbmc/dialogs                                    dialogs
 xbmc/favourites                                 favourites
+xbmc/guiinfo                                    guiinfo
 xbmc/guilib                                     guilib
 xbmc/input                                      input
 xbmc/input/joysticks                            input/joysticks
@@ -35,5 +42,6 @@ xbmc/storage                                    storage
 xbmc/threads                                    threads
 xbmc/utils                                      utils
 xbmc/view                                       view
+xbmc/weather                                    weather
 xbmc/windowing                                  windowing
 xbmc/windows                                    windows
diff --git a/cmake/treedata/common/video.txt b/cmake/treedata/common/video.txt
index acfb33b..ab53453 100644
--- a/cmake/treedata/common/video.txt
+++ b/cmake/treedata/common/video.txt
@@ -1,4 +1,5 @@
 xbmc/video           video
 xbmc/video/dialogs   video/dialogs
 xbmc/video/jobs      video/jobs
+xbmc/video/tags      video/tags
 xbmc/video/windows   video/windows
-- 
cgit v1.2.3