From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- cmake/treedata/optional/common/X.txt | 1 + cmake/treedata/optional/common/aml.txt | 1 + cmake/treedata/optional/common/gbm.txt | 3 ++- cmake/treedata/optional/common/imx.txt | 1 - cmake/treedata/optional/common/python.txt | 2 +- cmake/treedata/optional/common/wayland.txt | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 cmake/treedata/optional/common/imx.txt (limited to 'cmake/treedata/optional') 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 -- cgit v1.2.3