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 +- 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'project/cmake/treedata/common') 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 -- cgit v1.2.3