18 files changed, 53 insertions, 14 deletions

diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 0733201..b56618a 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -1,4 +1,5 @@
-xbmc/linux                              linuxsupport
+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
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
diff --git a/cmake/treedata/freebsd/subdirs.txt b/cmake/treedata/freebsd/subdirs.txt
index df2fa76..f7651ee 100644
--- a/cmake/treedata/freebsd/subdirs.txt
+++ b/cmake/treedata/freebsd/subdirs.txt
@@ -1,6 +1,5 @@
-xbmc/linux                 linuxsupport
-xbmc/linux/sse4            sse4
-xbmc/input/linux           input/linux
+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
diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt
index 4bbeeb1..00f5cf1 100644
--- a/cmake/treedata/ios/subdirs.txt
+++ b/cmake/treedata/ios/subdirs.txt
@@ -1,4 +1,4 @@
-xbmc/linux                       linuxsupport
+xbmc/platform/linux              platform/linux
 xbmc/input/touch                 input/touch
 xbmc/input/touch/generic         input/touch/generic
 xbmc/network/linux               network/linux
@@ -13,4 +13,5 @@ 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
diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt
index e301579..b310b53 100644
--- a/cmake/treedata/linux/subdirs.txt
+++ b/cmake/treedata/linux/subdirs.txt
@@ -1,5 +1,5 @@
-xbmc/linux                 linuxsupport
-xbmc/input/linux           input/linux
+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
@@ -9,5 +9,6 @@ xbmc/storage/linux         storage/linux
 xbmc/filesystem/posix      filesystem/posix
 xbmc/utils/posix           utils_posix
 xbmc/platform/posix        posix
+xbmc/cores/RetroPlayer/process/rbpi cores/RetroPlayer/process/rbpi
 xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi
 xbmc/windowing/linux       windowing/linux
diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/optional/common/X.txt
index 26b8a90..e66ad80 100644
--- a/cmake/treedata/optional/common/X.txt
+++ b/cmake/treedata/optional/common/X.txt
@@ -1,2 +1,3 @@
 xbmc/windowing/X11 windowing/X11 # X
+xbmc/cores/RetroPlayer/process/X11 cores/RetroPlayer/process/X11 # X
 xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X
diff --git a/cmake/treedata/optional/common/aml.txt b/cmake/treedata/optional/common/aml.txt
index db1efd1..3d412d0 100644
--- a/cmake/treedata/optional/common/aml.txt
+++ b/cmake/treedata/optional/common/aml.txt
@@ -1,2 +1,3 @@
+xbmc/cores/RetroPlayer/process/amlogic cores/RetroPlayer/process/amlogic # AML
 xbmc/windowing/amlogic windowing/amlogic # AML
 
diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt
index 1adde93..196b323 100644
--- a/cmake/treedata/optional/common/gbm.txt
+++ b/cmake/treedata/optional/common/gbm.txt
@@ -1 +1,2 @@
-xbmc/windowing/gbm windowing/gbm # GBM
+xbmc/cores/RetroPlayer/process/gbm cores/RetroPlayer/process/gbm # GBM
+xbmc/windowing/gbm windowing/gbm # GBM
\ No newline at end of file
diff --git a/cmake/treedata/optional/common/imx.txt b/cmake/treedata/optional/common/imx.txt
deleted file mode 100644
index 8c7e60b..0000000
--- a/cmake/treedata/optional/common/imx.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/windowing/egl         windowing/egl    # IMX
diff --git a/cmake/treedata/optional/common/python.txt b/cmake/treedata/optional/common/python.txt
index 4960485..c381a18 100644
--- a/cmake/treedata/optional/common/python.txt
+++ b/cmake/treedata/optional/common/python.txt
@@ -1,4 +1,4 @@
 xbmc/interfaces/legacy interfaces/legacy # PYTHON
 xbmc/interfaces/legacy/wsgi interfaces/legacy/wsgi # PYTHON
 xbmc/interfaces/python interfaces/python # PYTHON
-xbmc/interfaces/swig build/swig # PYTHON
+xbmc/interfaces/swig swig # PYTHON
diff --git a/cmake/treedata/optional/common/wayland.txt b/cmake/treedata/optional/common/wayland.txt
index 3725fc6..4664b35 100644
--- a/cmake/treedata/optional/common/wayland.txt
+++ b/cmake/treedata/optional/common/wayland.txt
@@ -1,2 +1,3 @@
 xbmc/windowing/wayland windowing/wayland # WAYLANDPP
+xbmc/cores/RetroPlayer/process/wayland cores/RetroPlayer/process/wayland # WAYLANDPP
 xbmc/cores/VideoPlayer/Process/wayland cores/VideoPlayer/Process/wayland # WAYLANDPP
\ No newline at end of file
diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt
index a520243..5b1b302 100644
--- a/cmake/treedata/osx/subdirs.txt
+++ b/cmake/treedata/osx/subdirs.txt
@@ -1,4 +1,4 @@
-xbmc/linux                   linuxsupport
+xbmc/platform/linux          platform/linux
 xbmc/network/linux           network/linux
 xbmc/network/osx             network/osx
 xbmc/peripherals/bus/osx     peripherals/bus/osx
@@ -10,4 +10,5 @@ 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
diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt
index bdbbe1d..8344320 100644
--- a/cmake/treedata/windows/subdirs.txt
+++ b/cmake/treedata/windows/subdirs.txt
@@ -12,4 +12,6 @@ xbmc/utils/win32             utils_win32
 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/externals.txt b/cmake/treedata/windowsstore/externals.txt
new file mode 100644
index 0000000..989677e
--- /dev/null
+++ b/cmake/treedata/windowsstore/externals.txt
@@ -0,0 +1 @@
+lib/win32/Effects11 Effects11
diff --git a/cmake/treedata/windowsstore/subdirs.txt b/cmake/treedata/windowsstore/subdirs.txt
new file mode 100644
index 0000000..84150d5
--- /dev/null
+++ b/cmake/treedata/windowsstore/subdirs.txt
@@ -0,0 +1,16 @@
+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/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows