From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- project/cmake/treedata/common/externals.txt | 1 - project/cmake/treedata/common/games.txt | 1 + project/cmake/treedata/common/network.txt | 2 -- project/cmake/treedata/common/subdirs.txt | 2 +- project/cmake/treedata/darwin/subdirs.txt | 12 ------------ project/cmake/treedata/freebsd/subdirs.txt | 17 +++++++++++++---- project/cmake/treedata/linux/subdirs.txt | 1 + project/cmake/treedata/optional/common/cdrip.txt | 1 + project/cmake/treedata/optional/common/dacp.txt | 1 + project/cmake/treedata/optional/common/upnp.txt | 2 ++ project/cmake/treedata/osx/subdirs.txt | 12 ++++++++++++ project/cmake/treedata/windows/externals.txt | 1 + project/cmake/treedata/windows/subdirs.txt | 3 +-- 13 files changed, 34 insertions(+), 22 deletions(-) delete mode 100644 project/cmake/treedata/darwin/subdirs.txt create mode 100644 project/cmake/treedata/optional/common/cdrip.txt create mode 100644 project/cmake/treedata/optional/common/dacp.txt create mode 100644 project/cmake/treedata/optional/common/upnp.txt create mode 100644 project/cmake/treedata/osx/subdirs.txt create mode 100644 project/cmake/treedata/windows/externals.txt (limited to 'project/cmake/treedata') diff --git a/project/cmake/treedata/common/externals.txt b/project/cmake/treedata/common/externals.txt index 632b354..e3b9ab4 100644 --- a/project/cmake/treedata/common/externals.txt +++ b/project/cmake/treedata/common/externals.txt @@ -1,3 +1,2 @@ xbmc/contrib/kissfft kissfft -lib/libUPnP upnp lib/libexif exif diff --git a/project/cmake/treedata/common/games.txt b/project/cmake/treedata/common/games.txt index e4e8b89..b622f5a 100644 --- a/project/cmake/treedata/common/games.txt +++ b/project/cmake/treedata/common/games.txt @@ -1,3 +1,4 @@ xbmc/games/controllers games/controllers +xbmc/games/controllers/dialogs games/controllers/dialogs xbmc/games/controllers/guicontrols games/controllers/guicontrols xbmc/games/controllers/windows games/controllers/windows diff --git a/project/cmake/treedata/common/network.txt b/project/cmake/treedata/common/network.txt index c0ec4a3..6331b2d 100644 --- a/project/cmake/treedata/common/network.txt +++ b/project/cmake/treedata/common/network.txt @@ -1,6 +1,4 @@ xbmc/network network -xbmc/network/dacp network/dacp xbmc/network/httprequesthandler network/httprequesthandler xbmc/network/httprequesthandler/python network/httprequesthandler/python -xbmc/network/upnp network/upnp xbmc/network/websocket network/websocket diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt index c2828e0..e2bca7e 100644 --- a/project/cmake/treedata/common/subdirs.txt +++ b/project/cmake/treedata/common/subdirs.txt @@ -10,13 +10,13 @@ xbmc/addons/binary/interfaces/api1/InputStream api1AddonCallbacks_InputStream xbmc/addons/binary/interfaces/api1/Peripheral api1AddonCallbacks_Peripheral xbmc/addons/binary/interfaces/api1/PVR api1AddonCallbacks_PVR xbmc/commons commons -xbmc/cdrip cdrip xbmc/dbwrappers dbwrappers xbmc/dialogs dialogs xbmc/epg epg xbmc/guilib guilib xbmc/input input xbmc/input/joysticks input/joysticks +xbmc/input/joysticks/dialogs input/joysticks/dialogs xbmc/input/joysticks/generic input/joysticks/generic xbmc/listproviders listproviders xbmc/media media diff --git a/project/cmake/treedata/darwin/subdirs.txt b/project/cmake/treedata/darwin/subdirs.txt deleted file mode 100644 index f0fc5c5..0000000 --- a/project/cmake/treedata/darwin/subdirs.txt +++ /dev/null @@ -1,12 +0,0 @@ -xbmc/linux linuxsupport -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 diff --git a/project/cmake/treedata/freebsd/subdirs.txt b/project/cmake/treedata/freebsd/subdirs.txt index faff03c..df2fa76 100644 --- a/project/cmake/treedata/freebsd/subdirs.txt +++ b/project/cmake/treedata/freebsd/subdirs.txt @@ -1,4 +1,13 @@ -xbmc/linux linuxsupport -xbmc/input/linux input/linux -xbmc/network/linux network/linux -xbmc/freebsd freebsdsupport +xbmc/linux linuxsupport +xbmc/linux/sse4 sse4 +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/freebsd freebsdsupport diff --git a/project/cmake/treedata/linux/subdirs.txt b/project/cmake/treedata/linux/subdirs.txt index 81a48e3..2dc8045 100644 --- a/project/cmake/treedata/linux/subdirs.txt +++ b/project/cmake/treedata/linux/subdirs.txt @@ -9,4 +9,5 @@ xbmc/powermanagement/linux powermanagement/linux xbmc/storage/linux storage/linux xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix +xbmc/windowing/egl windowing/egl xbmc/platform/posix posix diff --git a/project/cmake/treedata/optional/common/cdrip.txt b/project/cmake/treedata/optional/common/cdrip.txt new file mode 100644 index 0000000..79b5390 --- /dev/null +++ b/project/cmake/treedata/optional/common/cdrip.txt @@ -0,0 +1 @@ +xbmc/cdrip cdrip # OPTICAL diff --git a/project/cmake/treedata/optional/common/dacp.txt b/project/cmake/treedata/optional/common/dacp.txt new file mode 100644 index 0000000..fd225c2 --- /dev/null +++ b/project/cmake/treedata/optional/common/dacp.txt @@ -0,0 +1 @@ +xbmc/network/dacp network/dacp # AIRTUNES diff --git a/project/cmake/treedata/optional/common/upnp.txt b/project/cmake/treedata/optional/common/upnp.txt new file mode 100644 index 0000000..5589b80 --- /dev/null +++ b/project/cmake/treedata/optional/common/upnp.txt @@ -0,0 +1,2 @@ +lib/libUPnP upnp # UPNP +xbmc/network/upnp network/upnp # UPNP diff --git a/project/cmake/treedata/osx/subdirs.txt b/project/cmake/treedata/osx/subdirs.txt new file mode 100644 index 0000000..f0fc5c5 --- /dev/null +++ b/project/cmake/treedata/osx/subdirs.txt @@ -0,0 +1,12 @@ +xbmc/linux linuxsupport +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 diff --git a/project/cmake/treedata/windows/externals.txt b/project/cmake/treedata/windows/externals.txt new file mode 100644 index 0000000..989677e --- /dev/null +++ b/project/cmake/treedata/windows/externals.txt @@ -0,0 +1 @@ +lib/win32/Effects11 Effects11 diff --git a/project/cmake/treedata/windows/subdirs.txt b/project/cmake/treedata/windows/subdirs.txt index 60c0095..e52d2f6 100644 --- a/project/cmake/treedata/windows/subdirs.txt +++ b/project/cmake/treedata/windows/subdirs.txt @@ -1,4 +1,4 @@ -xbmc/win32 win32support +xbmc/platform/win32 platform_win32 xbmc/input/windows input/windows xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic @@ -9,7 +9,6 @@ xbmc/powermanagement/windows powermanagement/windows xbmc/storage/windows storage/windows xbmc/filesystem/win32 filesystem/win32 xbmc/utils/win32 utils_win32 -xbmc/platform/win32 platform_win32 xbmc/rendering/dx rendering_dx xbmc/threads/platform/win threads_win xbmc/windowing/windows windowing/windows -- cgit v1.2.3