From 4c3251ec645c8b71820dab7e51e612e5919d4e75 Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 23 Jul 2017 16:59:43 +0200 Subject: sync with upstream --- cmake/README.md | 15 ++++++--- cmake/installdata/common/addons.txt | 5 ++- cmake/installdata/windows/dlls.txt | 3 +- cmake/installdata/windows/python.txt | 1 - cmake/modules/FindBluray.cmake | 2 +- cmake/modules/FindEMBEDDED.cmake | 16 --------- cmake/modules/FindFFMPEG.cmake | 2 +- cmake/modules/FindGBM.cmake | 44 ++++++++++++++++++++++++ cmake/modules/FindLibDvd.cmake | 2 +- cmake/modules/FindOpenGLES.cmake | 18 +++------- cmake/modules/FindOpenGLES3.cmake | 24 ++++++++++++++ cmake/modules/FindSndio.cmake | 59 ++++++++++++++++++--------------- cmake/modules/FindVAAPI.cmake | 52 +++++++++++------------------ cmake/platform/android/android.cmake | 2 +- cmake/platform/linux/gbm.cmake | 2 ++ cmake/platform/linux/rbpi.cmake | 1 + cmake/platform/rbpi/defines.txt | 1 - cmake/platform/rbpi/rbpi.cmake | 1 - cmake/scripts/android/Install.cmake | 5 +-- cmake/scripts/common/AddonHelpers.cmake | 15 +++++++-- cmake/scripts/common/ArchSetup.cmake | 3 -- cmake/scripts/common/Macros.cmake | 10 +++--- cmake/scripts/common/Platform.cmake | 32 ++++++++++++++++++ cmake/scripts/common/PrepareEnv.cmake | 2 +- cmake/scripts/linux/ArchSetup.cmake | 21 ++++++++++-- cmake/scripts/linux/Install.cmake | 5 +-- cmake/scripts/rbpi/ArchSetup.cmake | 35 ------------------- cmake/scripts/rbpi/ExtraTargets.cmake | 1 - cmake/scripts/rbpi/Install.cmake | 1 - cmake/scripts/rbpi/Macros.cmake | 1 - cmake/scripts/rbpi/PathSetup.cmake | 1 - cmake/scripts/windows/ArchSetup.cmake | 14 +++----- cmake/treedata/android/subdirs.txt | 2 +- cmake/treedata/common/games.txt | 1 + cmake/treedata/common/subdirs.txt | 6 +++- cmake/treedata/ios/subdirs.txt | 1 + cmake/treedata/linux/subdirs.txt | 2 +- cmake/treedata/optional/common/X.txt | 1 + cmake/treedata/optional/common/gbm.txt | 1 + cmake/treedata/osx/subdirs.txt | 1 + cmake/treedata/rbpi/omxplayer.txt | 1 - cmake/treedata/rbpi/subdirs.txt | 12 ------- cmake/treedata/windows/subdirs.txt | 1 + 43 files changed, 241 insertions(+), 184 deletions(-) delete mode 100644 cmake/modules/FindEMBEDDED.cmake create mode 100644 cmake/modules/FindGBM.cmake create mode 100644 cmake/modules/FindOpenGLES3.cmake create mode 100644 cmake/platform/linux/gbm.cmake create mode 100644 cmake/platform/linux/rbpi.cmake delete mode 100644 cmake/platform/rbpi/defines.txt delete mode 100644 cmake/platform/rbpi/rbpi.cmake create mode 100644 cmake/scripts/common/Platform.cmake delete mode 100644 cmake/scripts/rbpi/ArchSetup.cmake delete mode 120000 cmake/scripts/rbpi/ExtraTargets.cmake delete mode 120000 cmake/scripts/rbpi/Install.cmake delete mode 120000 cmake/scripts/rbpi/Macros.cmake delete mode 120000 cmake/scripts/rbpi/PathSetup.cmake create mode 100644 cmake/treedata/optional/common/gbm.txt delete mode 100644 cmake/treedata/rbpi/omxplayer.txt delete mode 100644 cmake/treedata/rbpi/subdirs.txt (limited to 'cmake') diff --git a/cmake/README.md b/cmake/README.md index 6d338a4..81c0517 100644 --- a/cmake/README.md +++ b/cmake/README.md @@ -40,7 +40,7 @@ For Windows the dependencies can be found in the install the [Windows Software Development Kit (SDK)](https://dev.windows.com/en-us/downloads/sdk-archive) for your Windows version. This is required for HLSL shader offline compiling with the [Effect-Compiler Tool](https://msdn.microsoft.com/de-de/library/windows/desktop/bb232919(v=vs.85).aspx) (fxc.exe). On Windows, the CMake based buildsystem requires that the binary dependencies -are downloaded using `DownloadBuildDeps.bat` and `DownloadMingwBuildEnv.bat` +are downloaded using `download-dependencies.bat` and `download-msys2.bat` and that the mingw libs (ffmpeg, libdvd and others) are built using `make-mingwlibs.bat`. @@ -113,17 +113,24 @@ cmake --build . -- VERBOSE=1 -j$(nproc) # or: make VERBOSE=1 -j$(nproc) ``` ### Windows with Visual Studio project files - +#### Build for win32 ``` cmake -G "Visual Studio 14" cmake --build . --config "Debug" # or: Build solution with Visual Studio Debug\kodi.exe ``` +#### Build for x64 +``` +cmake -G "Visual Studio 14 Win64" +cmake --build . --config "Debug" # or: Build solution with Visual Studio +Debug\kodi.exe +``` +You can always check ``cmake --help` to see which generators are available and how to call those. #### Windows installer generation -The script [project/Win32BuildSetup](https://github.com/xbmc/xbmc/blob/master/project/Win32BuildSetup/BuildSetup.bat) -builds an installable package for Windows. +The script [project/Win32BuildSetup](https://github.com/xbmc/xbmc/blob/master/tools/buildsteps/windows/win32/BuildSetup.bat) or [project/Win64BuildSetup](https://github.com/xbmc/xbmc/blob/master/tools/buildsteps/windows/x64/BuildSetup.bat) +builds an installable package for Windows. Choose either 32bit or 64bit, depending on what your trying to build. ### Windows with NMake Makefiles diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt index 0c8f296..9efba38 100644 --- a/cmake/installdata/common/addons.txt +++ b/cmake/installdata/common/addons.txt @@ -1,6 +1,5 @@ -addons/audioencoder.xbmc.builtin.aac/* -addons/audioencoder.xbmc.builtin.wav/* -addons/audioencoder.xbmc.builtin.wma/* +addons/audioencoder.kodi.builtin.aac/* +addons/audioencoder.kodi.builtin.wma/* addons/game.controller.default/* addons/kodi.adsp/* addons/kodi.audiodecoder/* diff --git a/cmake/installdata/windows/dlls.txt b/cmake/installdata/windows/dlls.txt index de82a86..25c6500 100644 --- a/cmake/installdata/windows/dlls.txt +++ b/cmake/installdata/windows/dlls.txt @@ -1,3 +1,4 @@ system/*.dll . -project/Win32BuildSetup/dependencies/python27.dll . +project/BuildDependencies/${ARCH}/bin/libbluray*.jar . project/BuildDependencies/${ARCH}/bin/*.dll . +project/BuildDependencies/mingwlibs/${ARCH}/bin/*.dll . diff --git a/cmake/installdata/windows/python.txt b/cmake/installdata/windows/python.txt index e487e3f..5606628 100644 --- a/cmake/installdata/windows/python.txt +++ b/cmake/installdata/windows/python.txt @@ -1,2 +1 @@ -system/python/* project/BuildDependencies/${ARCH}/bin/Python KEEP_DIR_STRUCTURE system diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake index 0bba128..9e5bf08 100644 --- a/cmake/modules/FindBluray.cmake +++ b/cmake/modules/FindBluray.cmake @@ -15,7 +15,7 @@ # Bluray::Bluray - The libbluray library if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_BLURAY libbluray>=0.7.0 QUIET) + pkg_check_modules(PC_BLURAY libbluray>=0.9.3 QUIET) endif() find_path(BLURAY_INCLUDE_DIR libbluray/bluray.h diff --git a/cmake/modules/FindEMBEDDED.cmake b/cmake/modules/FindEMBEDDED.cmake deleted file mode 100644 index 8034c4e..0000000 --- a/cmake/modules/FindEMBEDDED.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# - Try to find embedded platforms (RPI/IMX6) -# Once done this will define -# -# EMBEDDED_FOUND - system is RPI / IMX6 and we most probably want to compile for GLES2 support -# (don't configure for OpenGL) - -if(NOT CMAKE_SYSTEM_PROCESSOR) - set(CMAKE_SYSTEM_PROCESSOR ${CPU}) -endif() - -string(REGEX MATCH "^arm" TARGET_ARCH_ARM "${CMAKE_SYSTEM_PROCESSOR}") -if(NOT KODI_DEPENDSBUILD AND NOT TARGET_ARCH_ARM) - return() -endif() - -find_path(EMBEDDED_FOUND NAMES include/linux/mxcfb.h include/bcm_host.h PATHS /opt/vc) diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake index 63505a5..dbeb444 100644 --- a/cmake/modules/FindFFMPEG.cmake +++ b/cmake/modules/FindFFMPEG.cmake @@ -224,7 +224,7 @@ if(NOT FFMPEG_FOUND) if(FFMPEG_URL) get_filename_component(FFMPEG_URL "${FFMPEG_URL}" ABSOLUTE) else() - set(FFMPEG_URL ${FFMPEG_BASE_URL}/${FFMPEG_VER}.tar.gz) + set(FFMPEG_URL ${FFMPEG_BASE_URL}/archive/${FFMPEG_VER}.tar.gz) endif() if(VERBOSE) message(STATUS "FFMPEG_URL: ${FFMPEG_URL}") diff --git a/cmake/modules/FindGBM.cmake b/cmake/modules/FindGBM.cmake new file mode 100644 index 0000000..ac95241 --- /dev/null +++ b/cmake/modules/FindGBM.cmake @@ -0,0 +1,44 @@ +# FindGBM +# ---------- +# Finds the GBM library +# +# This will will define the following variables:: +# +# GBM_FOUND - system has GBM +# GBM_INCLUDE_DIRS - the GBM include directory +# GBM_LIBRARIES - the GBM libraries +# GBM_DEFINITIONS - the GBM definitions +# +# and the following imported targets:: +# +# GBM::GBM - The GBM library + +if(PKG_CONFIG_FOUND) + pkg_check_modules(PC_GBM gbm QUIET) +endif() + +find_path(GBM_INCLUDE_DIR NAMES gbm.h + PATHS ${PC_GBM_INCLUDEDIR}) +find_library(GBM_LIBRARY NAMES gbm + PATHS ${PC_GBM_LIBDIR}) + +set(GBM_VERSION ${PC_GBM_VERSION}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(GBM + REQUIRED_VARS GBM_LIBRARY GBM_INCLUDE_DIR + VERSION_VAR GBM_VERSION) + +if(GBM_FOUND) + set(GBM_LIBRARIES ${GBM_LIBRARY}) + set(GBM_INCLUDE_DIRS ${GBM_INCLUDE_DIR}) + set(GBM_DEFINITIONS -DHAVE_GBM=1) + if(NOT TARGET GBM::GBM) + add_library(GBM::GBM UNKNOWN IMPORTED) + set_target_properties(GBM::GBM PROPERTIES + IMPORTED_LOCATION "${GBM_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${GBM_INCLUDE_DIR}") + endif() +endif() + +mark_as_advanced(GBM_INCLUDE_DIR GBM_LIBRARY) diff --git a/cmake/modules/FindLibDvd.cmake b/cmake/modules/FindLibDvd.cmake index eeb416c..86af89c 100644 --- a/cmake/modules/FindLibDvd.cmake +++ b/cmake/modules/FindLibDvd.cmake @@ -203,7 +203,7 @@ if(NOT WIN32) endif() else() # Dynamically loaded on Windows - find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h PATHS ${CMAKE_SOURCE_DIR}/lib/libdvd/include) + find_path(LIBDVD_INCLUDE_DIR dvdcss/dvdcss.h) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibDvd REQUIRED_VARS LIBDVD_INCLUDE_DIR) diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake index ab06f96..4333a69 100644 --- a/cmake/modules/FindOpenGLES.cmake +++ b/cmake/modules/FindOpenGLES.cmake @@ -10,13 +10,8 @@ # OPENGLES_LIBRARIES - the OpenGLES libraries # OPENGLES_DEFINITIONS - the OpenGLES definitions -find_package(EMBEDDED) - -if(PKG_CONFIG_FOUND AND NOT PLATFORM STREQUAL "raspberry-pi") +if(PKG_CONFIG_FOUND) pkg_check_modules(PC_OPENGLES glesv2 QUIET) - if(NOT OPENGLES_FOUND AND EMBEDDED_FOUND) - set(CMAKE_PREFIX_PATH ${EMBEDDED_FOUND} ${CMAKE_PREFIX_PATH}) - endif() endif() if(NOT CORE_SYSTEM_NAME STREQUAL ios) @@ -24,25 +19,22 @@ if(NOT CORE_SYSTEM_NAME STREQUAL ios) PATHS ${PC_OPENGLES_INCLUDEDIR}) find_library(OPENGLES_gl_LIBRARY NAMES GLESv2 PATHS ${PC_OPENGLES_LIBDIR}) - find_library(OPENGLES_egl_LIBRARY NAMES EGL - PATHS ${PC_OPENGLES_LIBDIR}) else() find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES PATHS ${CMAKE_OSX_SYSROOT}/System/Library PATH_SUFFIXES Frameworks NO_DEFAULT_PATH) set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers) - set(OPENGLES_egl_LIBRARY ${OPENGLES_gl_LIBRARY}) endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(OpenGLES - REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_egl_LIBRARY OPENGLES_INCLUDE_DIR) + REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR) if(OPENGLES_FOUND) set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR}) - set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY} ${OPENGLES_egl_LIBRARY}) - set(OPENGLES_DEFINITIONS -DHAVE_LIBGLESV2 -DHAVE_LIBEGL=1) + set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY}) + set(OPENGLES_DEFINITIONS -DHAVE_LIBGLESV2) endif() -mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY OPENGLES_egl_LIBRARY) +mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY) diff --git a/cmake/modules/FindOpenGLES3.cmake b/cmake/modules/FindOpenGLES3.cmake new file mode 100644 index 0000000..394328d --- /dev/null +++ b/cmake/modules/FindOpenGLES3.cmake @@ -0,0 +1,24 @@ +#.rst: +# FindOpenGLES3 +# ------------ +# Finds the OpenGLES3 library +# +# This will will define the following variables:: +# +# OPENGLES3_FOUND - system has OpenGLES3 +# OPENGLES3_INCLUDE_DIRS - the OpenGLES3 include directory +# OPENGLES3_DEFINITIONS - the OpenGLES3 definitions + + +find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(OpenGLES3 + REQUIRED_VARS OPENGLES3_INCLUDE_DIR) + +if(OPENGLES3_FOUND) + set(OPENGLES3_INCLUDE_DIRS ${OPENGLES3_INCLUDE_DIR}) + set(OPENGLES3_DEFINITIONS -DHAVE_LIBGLESV3) +endif() + +mark_as_advanced(OPENGLES3_INCLUDE_DIR) diff --git a/cmake/modules/FindSndio.cmake b/cmake/modules/FindSndio.cmake index 4e66a4b..3dd53d9 100644 --- a/cmake/modules/FindSndio.cmake +++ b/cmake/modules/FindSndio.cmake @@ -1,34 +1,41 @@ -# sndio check, based on FindAlsa.cmake # - -# Copyright (c) 2006, David Faure, -# Copyright (c) 2007, Matthias Kretz -# Copyright (c) 2009, Jacob Meuser +# FindSndio +# --------- +# Finds the Sndio Library +# +# This will will define the following variables: +# +# SNDIO_FOUND - system has sndio +# SNDIO_INCLUDE_DIRS - sndio include directory +# SNDIO_DEFINITIONS - sndio definitions +# +# and the following imported targets:: +# +# Sndio::Sndio - the sndio library # -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -include(CheckIncludeFiles) -include(CheckIncludeFileCXX) -include(CheckLibraryExists) -# Already done by toplevel +find_path(SNDIO_INCLUDE_DIR sndio.h) find_library(SNDIO_LIBRARY sndio) -set(SNDIO_LIBRARY_DIR "") -if(SNDIO_LIBRARY) - get_filename_component(SNDIO_LIBRARY_DIR ${SNDIO_LIBRARY} PATH) -endif(SNDIO_LIBRARY) -check_library_exists(sndio sio_open "${SNDIO_LIBRARY_DIR}" HAVE_SNDIO) -if(HAVE_SNDIO) - message(STATUS "Found sndio: ${SNDIO_LIBRARY}") - set(SNDIO_DEFINITIONS -DHAVE_SNDIO=1) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Sndio + REQUIRED_VARS SNDIO_LIBRARY SNDIO_INCLUDE_DIR) + +if(SNDIO_FOUND) + set(SNDIO_INCLUDE_DIRS ${SNDIO_INCLUDE_DIR}) set(SNDIO_LIBRARIES ${SNDIO_LIBRARY}) -else(HAVE_SNDIO) - message(STATUS "sndio not found") -endif(HAVE_SNDIO) -set(SNDIO_FOUND ${HAVE_SNDIO}) + set(SNDIO_DEFINITIONS -DHAVE_SNDIO=1) + + if(NOT TARGET Sndio::Sndio) + add_library(Sndio::Sndio UNKNOWN IMPORTED) + set_target_properties(Sndio::Sndio PROPERTIES + IMPORTED_LOCATION "${SNDIO_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${SNDIO_INCLUDE_DIR}") + set_target_properties(Sndio::Sndio PROPERTIES + INTERFACE_COMPILE_DEFINITIONS -DHAVE_SNDIO=1) + endif() +endif() -find_path(SNDIO_INCLUDES sndio.h) -mark_as_advanced(SNDIO_INCLUDES SNDIO_LIBRARY) +mark_as_advanced(SNDIO_INCLUDE_DIR SNDIO_LIBRARY) diff --git a/cmake/modules/FindVAAPI.cmake b/cmake/modules/FindVAAPI.cmake index 49f74d8..5b57d23 100644 --- a/cmake/modules/FindVAAPI.cmake +++ b/cmake/modules/FindVAAPI.cmake @@ -9,23 +9,29 @@ # VAAPI_INCLUDE_DIRS - the VAAPI include directory # VAAPI_LIBRARIES - the VAAPI libraries # VAAPI_DEFINITIONS - the VAAPI definitions -# -# and the following imported targets:: -# -# VAAPI::VAAPI - The VAAPI library if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_VAAPI libva libva-x11 QUIET) + pkg_check_modules(PC_VAAPI libva libva-drm libva-x11 QUIET) endif() -find_path(VAAPI_INCLUDE_DIR va/va.h +set(REQUIRED_VARS "VAAPI_libva_LIBRARY" "VAAPI_libva-drm_LIBRARY" "VAAPI_libva_INCLUDE_DIR" "VAAPI_libva-drm_INCLUDE_DIR") + +find_path(VAAPI_libva_INCLUDE_DIR va/va.h PATHS ${PC_VAAPI_libva_INCLUDEDIR}) find_library(VAAPI_libva_LIBRARY NAMES va PATHS ${PC_VAAPI_libva_LIBDIR}) -find_library(VAAPI_libva-x11_LIBRARY NAMES va-x11 - PATHS ${PC_VAAPI_libva_LIBDIR}) +find_path(VAAPI_libva-drm_INCLUDE_DIR va/va_drm.h + PATHS ${PC_VAAPI_libva-drm_INCLUDEDIR}) find_library(VAAPI_libva-drm_LIBRARY NAMES va-drm - PATHS ${PC_VAAPI_libva_LIBDIR}) + PATHS ${PC_VAAPI_libva-drm_LIBDIR}) + +if(CORE_PLATFORM_NAME_LC STREQUAL "x11") + find_path(VAAPI_libva-x11_INCLUDE_DIR va/va_x11.h + PATHS ${PC_VAAPI_libva-x11_INCLUDEDIR}) + find_library(VAAPI_libva-x11_LIBRARY NAMES va-x11 + PATHS ${PC_VAAPI_libva-x11_LIBDIR}) + list(APPEND REQUIRED_VARS "VAAPI_libva-x11_INCLUDE_DIR" "VAAPI_libva-x11_LIBRARY") +endif() if(PC_VAAPI_libva_VERSION) set(VAAPI_VERSION_STRING ${PC_VAAPI_libva_VERSION}) @@ -41,32 +47,14 @@ endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(VAAPI - REQUIRED_VARS VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY VAAPI_libva-drm_LIBRARY VAAPI_INCLUDE_DIR + REQUIRED_VARS ${REQUIRED_VARS} VERSION_VAR VAAPI_VERSION_STRING) if(VAAPI_FOUND) - set(VAAPI_INCLUDE_DIRS ${VAAPI_INCLUDE_DIR}) - set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-x11_LIBRARY} ${VAAPI_libva-drm_LIBRARY}) + set(VAAPI_INCLUDE_DIRS ${VAAPI_INCLUDE_DIR} ${VAAPI_DRM_INCLUDE_DIR} ${VAAPI_X11_INCLUDE_DIR}) + set(VAAPI_LIBRARIES ${VAAPI_libva_LIBRARY} ${VAAPI_libva-drm_LIBRARY} ${VAAPI_libva-x11_LIBRARY}) set(VAAPI_DEFINITIONS -DHAVE_LIBVA=1) - - if(NOT TARGET VAAPI::VAAPI_X11) - add_library(VAAPI::VAAPI_X11 UNKNOWN IMPORTED) - set_target_properties(VAAPI::VAAPI_X11 PROPERTIES - IMPORTED_LOCATION "${VAAPI_libva-x11_LIBRARY}") - endif() - if (NOT TARGET VAAPI::VAAPI_DRM) - add_library(VAAPI::VAAPI_DRM UNKNOWN IMPORTED) - set_target_properties(VAAPI::VAAPI_DRM PROPERTIES - IMPORTED_LOCATION "${VAAPI_libva-drm_LIBRARY}") - endif() - if(NOT TARGET VAAPI::VAAPI) - add_library(VAAPI::VAAPI UNKNOWN IMPORTED) - set_target_properties(VAAPI::VAAPI PROPERTIES - IMPORTED_LOCATION "${VAAPI_libva_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${VAAPI_INCLUDE_DIR}" - INTERFACE_COMPILE_DEFINITIONS HAVE_LIBVA=1 - INTERFACE_LINK_LIBRARIES "VAAPI::VAAPI_X11 VAAPI::VAAPI_DRM") - endif() endif() -mark_as_advanced(VAAPI_INCLUDE_DIR VAAPI_libva_LIBRARY VAAPI_libva-x11_LIBRARY VAAPI_libva-drm_LIBRARY) +mark_as_advanced(VAAPI_libva_INCLUDE_DIR VAAPI_libva-drm_INCLUDE_DIR VAAPI_libva-x11_INCLUDE_DIR + VAAPI_libva_LIBRARY VAAPI_libva-drm_LIBRARY VAAPI_libva-x11_LIBRARY) diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake index ab0f361..bfa003b 100644 --- a/cmake/platform/android/android.cmake +++ b/cmake/platform/android/android.cmake @@ -1 +1 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES) +set(PLATFORM_REQUIRED_DEPS OpenGLES EGL) diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake new file mode 100644 index 0000000..616cefb --- /dev/null +++ b/cmake/platform/linux/gbm.cmake @@ -0,0 +1,2 @@ +set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM) +set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES3) diff --git a/cmake/platform/linux/rbpi.cmake b/cmake/platform/linux/rbpi.cmake new file mode 100644 index 0000000..4899857 --- /dev/null +++ b/cmake/platform/linux/rbpi.cmake @@ -0,0 +1 @@ +set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL) diff --git a/cmake/platform/rbpi/defines.txt b/cmake/platform/rbpi/defines.txt deleted file mode 100644 index 08fe4cb..0000000 --- a/cmake/platform/rbpi/defines.txt +++ /dev/null @@ -1 +0,0 @@ --DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI diff --git a/cmake/platform/rbpi/rbpi.cmake b/cmake/platform/rbpi/rbpi.cmake deleted file mode 100644 index 4899857..0000000 --- a/cmake/platform/rbpi/rbpi.cmake +++ /dev/null @@ -1 +0,0 @@ -set(PLATFORM_REQUIRED_DEPS OpenGLES EGL MMAL) diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake index 0ab7dbd..4065fc3 100644 --- a/cmake/scripts/android/Install.cmake +++ b/cmake/scripts/android/Install.cmake @@ -41,13 +41,13 @@ set(package_files strings.xml src/org/xbmc/kodi/XBMCInputDeviceListener.java src/org/xbmc/kodi/XBMCJsonRPC.java src/org/xbmc/kodi/XBMCMediaContentProvider.java - src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java - src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java src/org/xbmc/kodi/XBMCRecommendationBuilder.java src/org/xbmc/kodi/XBMCSearchableActivity.java src/org/xbmc/kodi/XBMCSettingsContentObserver.java src/org/xbmc/kodi/XBMCProperties.java src/org/xbmc/kodi/XBMCVideoView.java + src/org/xbmc/kodi/interfaces/XBMCAudioManagerOnAudioFocusChangeListener.java + src/org/xbmc/kodi/interfaces/XBMCSurfaceTextureOnFrameAvailableListener.java ) foreach(file IN LISTS package_files) configure_file(${CMAKE_SOURCE_DIR}/tools/android/packaging/xbmc/${file}.in @@ -121,6 +121,7 @@ foreach(target apk obb apk-unsigned apk-obb apk-obb-unsigned apk-noobb apk-clean CPU=${CPU} ARCH=${ARCH} PREFIX=${prefix} + DEPENDS_PATH=${DEPENDS_PATH} NDKROOT=${NDKROOT} SDKROOT=${SDKROOT} SDK_PLATFORM=${SDK_PLATFORM} diff --git a/cmake/scripts/common/AddonHelpers.cmake b/cmake/scripts/common/AddonHelpers.cmake index 8772057..abb79ff 100644 --- a/cmake/scripts/common/AddonHelpers.cmake +++ b/cmake/scripts/common/AddonHelpers.cmake @@ -228,7 +228,7 @@ macro (build_addon target prefix libs) set(CPACK_COMPONENTS_IGNORE_GROUPS 1) list(APPEND CPACK_COMPONENTS_ALL ${target}-${${prefix}_VERSION}) # Pack files together to create an archive - install(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION} PATTERN "xml.in" EXCLUDE) + install(DIRECTORY ${target} DESTINATION ./ COMPONENT ${target}-${${prefix}_VERSION} PATTERN "*.xml.in" EXCLUDE) if(WIN32) if(NOT CPACK_PACKAGE_DIRECTORY) # determine the temporary path @@ -266,6 +266,9 @@ macro (build_addon target prefix libs) if(${prefix}_CUSTOM_DATA) install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${target}/resources) endif() + if(${prefix}_ADDITIONAL_BINARY) + install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${target}) + endif() else() # NOT WIN32 if(NOT CPACK_PACKAGE_DIRECTORY) set(CPACK_PACKAGE_DIRECTORY ${CMAKE_BINARY_DIR}) @@ -281,10 +284,13 @@ macro (build_addon target prefix libs) if(${prefix}_CUSTOM_DATA) install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${target}/resources) endif() + if(${prefix}_ADDITIONAL_BINARY) + install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${target}) + endif() endif() add_cpack_workaround(${target} ${${prefix}_VERSION} ${ext}) else() - if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi OR CORE_SYSTEM_NAME STREQUAL freebsd) + if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) if(NOT OVERRIDE_PATHS) if(CMAKE_INSTALL_PREFIX AND NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT CMAKE_INSTALL_PREFIX STREQUAL "${${APP_NAME_UC}_PREFIX}") message(WARNING "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} differs from ${APP_NAME} prefix, changing to ${${APP_NAME_UC}_PREFIX}. Please pass -DOVERRIDE_PATHS=1 to skip this check") @@ -316,10 +322,13 @@ macro (build_addon target prefix libs) if (${prefix}_CUSTOM_BINARY) install(FILES ${LIBRARY_LOCATION} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target} RENAME ${LIBRARY_FILENAME}) endif() - install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons PATTERN "xml.in" EXCLUDE) + install(DIRECTORY ${target} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons PATTERN "*.xml.in" EXCLUDE) if(${prefix}_CUSTOM_DATA) install(DIRECTORY ${${prefix}_CUSTOM_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/addons/${target}/resources) endif() + if(${prefix}_ADDITIONAL_BINARY) + install(FILES ${${prefix}_ADDITIONAL_BINARY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/addons/${target}) + endif() endif() if(${APP_NAME_UC}_BUILD_DIR) file(GLOB_RECURSE files ${CMAKE_CURRENT_SOURCE_DIR}/${target}/*) diff --git a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake index 8d5dba8..357c14c 100644 --- a/cmake/scripts/common/ArchSetup.cmake +++ b/cmake/scripts/common/ArchSetup.cmake @@ -54,9 +54,6 @@ endmacro() # -------- Main script --------- message(STATUS "System type: ${CMAKE_SYSTEM_NAME}") -if(NOT CORE_SYSTEM_NAME) - string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME) -endif() if(WITH_CPU) set(CPU ${WITH_CPU}) diff --git a/cmake/scripts/common/Macros.cmake b/cmake/scripts/common/Macros.cmake index 4b6f890..8bee3da 100644 --- a/cmake/scripts/common/Macros.cmake +++ b/cmake/scripts/common/Macros.cmake @@ -706,13 +706,13 @@ macro(find_addon_xml_in_files) foreach(loop_var ${ADDON_FILES}) if(loop_var MATCHES "addon.xml.in") string(REPLACE "addon.xml.in" "addon.xml" loop_var ${loop_var}) - endif() - list(GET loop_var 0 file_name) - string(REPLACE "${CORE_SOURCE_DIR}/" "" file_name ${file_name}) - list(APPEND ADDON_INSTALL_DATA "${file_name}") + list(GET loop_var 0 file_name) + string(REPLACE "${CORE_SOURCE_DIR}/" "" file_name ${file_name}) + list(APPEND ADDON_INSTALL_DATA "${file_name}") - unset(file_name) + unset(file_name) + endif() endforeach() unset(xml_name) endforeach() diff --git a/cmake/scripts/common/Platform.cmake b/cmake/scripts/common/Platform.cmake new file mode 100644 index 0000000..b19b7e5 --- /dev/null +++ b/cmake/scripts/common/Platform.cmake @@ -0,0 +1,32 @@ +if(NOT CORE_SYSTEM_NAME) + string(TOLOWER ${CMAKE_SYSTEM_NAME} CORE_SYSTEM_NAME) +endif() + +if(CORE_SYSTEM_NAME STREQUAL linux) + # Set default CORE_PLATFORM_NAME to X11 + # This is overridden by user setting -DCORE_PLATFORM_NAME= + set(_DEFAULT_PLATFORM X11) +else() + string(TOLOWER ${CORE_SYSTEM_NAME} _DEFAULT_PLATFORM) +endif() + +# +# Note: please do not use CORE_PLATFORM_NAME in any checks, +# use the normalized to lower case CORE_PLATFORM_NAME_LC (see below) instead +# +if(NOT CORE_PLATFORM_NAME) + set(CORE_PLATFORM_NAME ${_DEFAULT_PLATFORM} CACHE STRING "Platform port to build") +endif() +unset(_DEFAULT_PLATFORM) +string(TOLOWER ${CORE_PLATFORM_NAME} CORE_PLATFORM_NAME_LC) + +list(APPEND final_message "Platform: ${CORE_PLATFORM_NAME}") +if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake) + include(${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/${CORE_PLATFORM_NAME_LC}.cmake) +else() + file(GLOB _platformnames RELATIVE ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/ + ${CMAKE_SOURCE_DIR}/cmake/platform/${CORE_SYSTEM_NAME}/*.cmake) + string(REPLACE ".cmake" " " _platformnames ${_platformnames}) + message(FATAL_ERROR "invalid CORE_PLATFORM_NAME: ${CORE_PLATFORM_NAME_LC}\nValid platforms: ${_platformnames}") +endif() + diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index 4dc8698..5a6066b 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -42,7 +42,7 @@ file(COPY ${CORE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake # copy standard add-on include files file(COPY ${CORE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ - DESTINATION ${APP_INCLUDE_DIR}) + DESTINATION ${APP_INCLUDE_DIR} REGEX ".txt" EXCLUDE) ### copy all the addon binding header files to include/kodi # parse addon-bindings.mk to get the list of header files to copy diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake index c31becd..bf32fe0 100644 --- a/cmake/scripts/linux/ArchSetup.cmake +++ b/cmake/scripts/linux/ArchSetup.cmake @@ -1,6 +1,10 @@ set(ARCH_DEFINES -D_LINUX -DTARGET_POSIX -DTARGET_LINUX) -set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) +# temp until further cleanup is done +if(CORE_PLATFORM_NAME_LC STREQUAL rbpi) + list(APPEND ARCH_DEFINES -D_ARMEL -DTARGET_RASPBERRY_PI) +endif() +set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED + -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) set(PLATFORM_DIR linux) set(CMAKE_SYSTEM_NAME Linux) if(WITH_ARCH) @@ -13,6 +17,14 @@ else() set(ARCH i486-linux) set(NEON False) add_options(CXX ALL_BUILDS "-msse") + elseif(CPU STREQUAL arm1176jzf-s) + set(ARCH arm) + set(NEON False) + set(NEON_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp") + elseif(CPU MATCHES "cortex-a7" OR CPU MATCHES "cortex-a53") + set(ARCH arm) + set(NEON True) + set(NEON_FLAGS "-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad") elseif(CPU MATCHES arm) set(ARCH arm) set(NEON True) @@ -44,3 +56,8 @@ endif() if(ENABLE_MIR) set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU since no Mir support" FORCE) endif() + +if(ENABLE_GBM) + set(ENABLE_VDPAU OFF CACHE BOOL "Disabling VDPAU" FORCE) + set(ENABLE_VAAPI OFF CACHE BOOL "Disabling VAAPI" FORCE) +endif() diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake index 613a989..7a2705b 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake @@ -148,7 +148,8 @@ endif() # Install kodi-addon-dev headers install(DIRECTORY ${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-addon-dev-kit/include/kodi/ DESTINATION ${includedir}/${APP_NAME_LC} - COMPONENT kodi-addon-dev) + COMPONENT kodi-addon-dev + REGEX ".txt" EXCLUDE) install(FILES ${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h ${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxCrypto.h @@ -301,7 +302,7 @@ endforeach() # generate packages? yes please, if everything checks out if(CPACK_GENERATOR) - if(CPACK_GENERATOR STREQUAL DEB AND ( CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL rbpi ) ) + if(CPACK_GENERATOR STREQUAL DEB AND CORE_SYSTEM_NAME STREQUAL linux) if(CMAKE_BUILD_TYPE STREQUAL Debug) message(STATUS "DEB Generator: Build type is set to 'Debug'. Packaged binaries will be unstripped.") endif() diff --git a/cmake/scripts/rbpi/ArchSetup.cmake b/cmake/scripts/rbpi/ArchSetup.cmake deleted file mode 100644 index 6fc2c21..0000000 --- a/cmake/scripts/rbpi/ArchSetup.cmake +++ /dev/null @@ -1,35 +0,0 @@ -set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI - -DHAS_OMXPLAYER -DHAVE_OMXLIB) -set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64) -set(PLATFORM_DIR linux) - -string(REGEX REPLACE "[ ]+" ";" SYSTEM_LDFLAGS "$ENV{LDFLAGS}") -set(CMAKE_SYSTEM_NAME Linux) - -if(WITH_ARCH) - set(ARCH ${WITH_ARCH}) -else() - if(CPU STREQUAL arm1176jzf-s) - set(ARCH arm) - set(NEON False) - set(NEON_FLAGS "-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp") - elseif(CPU MATCHES "cortex-a7" OR CPU MATCHES "cortex-a53") - set(ARCH arm) - set(NEON True) - set(NEON_FLAGS "-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4 -mvectorize-with-neon-quad") - else() - message(SEND_ERROR "Unknown CPU: ${CPU}") - endif() -endif() - -# Make sure we strip binaries in Release build -if(CMAKE_BUILD_TYPE STREQUAL Release AND CMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") -endif() - -find_package(CXX11 REQUIRED) - -set(MMAL_FOUND 1 CACHE INTERNAL "MMAL") -set(OMX_FOUND 1 CACHE INTERNAL "OMX") -set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX") diff --git a/cmake/scripts/rbpi/ExtraTargets.cmake b/cmake/scripts/rbpi/ExtraTargets.cmake deleted file mode 120000 index e757c60..0000000 --- a/cmake/scripts/rbpi/ExtraTargets.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/ExtraTargets.cmake \ No newline at end of file diff --git a/cmake/scripts/rbpi/Install.cmake b/cmake/scripts/rbpi/Install.cmake deleted file mode 120000 index 28ce012..0000000 --- a/cmake/scripts/rbpi/Install.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/Install.cmake \ No newline at end of file diff --git a/cmake/scripts/rbpi/Macros.cmake b/cmake/scripts/rbpi/Macros.cmake deleted file mode 120000 index 2fdbb25..0000000 --- a/cmake/scripts/rbpi/Macros.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/Macros.cmake \ No newline at end of file diff --git a/cmake/scripts/rbpi/PathSetup.cmake b/cmake/scripts/rbpi/PathSetup.cmake deleted file mode 120000 index 6786c1c..0000000 --- a/cmake/scripts/rbpi/PathSetup.cmake +++ /dev/null @@ -1 +0,0 @@ -../linux/PathSetup.cmake \ No newline at end of file diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 11c45cf..9634b3a 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -13,21 +13,17 @@ endif() set(PLATFORM_DIR platform/win32) +set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/win32/WinMain.cpp) + # Precompiled headers fail with per target output directory. (needs CMake 3.1) set(PRECOMPILEDHEADER_DIR ${PROJECT_BINARY_DIR}/${CORE_BUILD_CONFIG}/objs) set(CMAKE_SYSTEM_NAME Windows) -list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/lib/win32) -list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg) -list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib/win32/ffmpeg/bin) +list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH}) +list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/mingwlibs/${ARCH}/bin) list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}) list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${CMAKE_SOURCE_DIR}/project/BuildDependencies) - -if(${ARCH} STREQUAL win32) - set(PYTHON_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/project/BuildDependencies/include/python) -else() - set(PYTHON_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/include/python) -endif() +set(PYTHON_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/project/BuildDependencies/${ARCH}/include/python) # -------- Compiler options --------- diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt index e175b6d..0733201 100644 --- a/cmake/treedata/android/subdirs.txt +++ b/cmake/treedata/android/subdirs.txt @@ -2,6 +2,7 @@ xbmc/linux linuxsupport xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/linux network/linux +xbmc/network/android network/android xbmc/peripherals/bus/linux peripherals/bus/linux xbmc/peripherals/bus/android peripherals/bus/android xbmc/powermanagement/android powermanagement/android @@ -12,4 +13,3 @@ xbmc/windowing/android windowing/android xbmc/platform/posix posix xbmc/platform/android/activity android_activity xbmc/platform/android/bionic_supplement android_bionicsupplement -xbmc/platform/android/loader android_loader diff --git a/cmake/treedata/common/games.txt b/cmake/treedata/common/games.txt index 03d42bc..b2faead 100644 --- a/cmake/treedata/common/games.txt +++ b/cmake/treedata/common/games.txt @@ -7,6 +7,7 @@ xbmc/games/controllers/dialogs games/controllers/dialogs xbmc/games/controllers/guicontrols games/controllers/guicontrols xbmc/games/controllers/windows games/controllers/windows xbmc/games/dialogs games/dialogs +xbmc/games/dialogs/osd games/dialogs/osd xbmc/games/ports games/ports xbmc/games/tags games/tags xbmc/games/windows games/windows diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt index 5a25afe..ee4e83c 100644 --- a/cmake/treedata/common/subdirs.txt +++ b/cmake/treedata/common/subdirs.txt @@ -1,8 +1,11 @@ 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/GUI addonCallbacks_GUI +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/commons commons xbmc/dbwrappers dbwrappers @@ -13,6 +16,7 @@ xbmc/input input xbmc/input/joysticks input/joysticks xbmc/input/joysticks/dialogs input/joysticks/dialogs xbmc/input/joysticks/generic input/joysticks/generic +xbmc/input/joysticks/keymaps input/joysticks/keymaps xbmc/input/keyboard input/keyboard xbmc/input/keyboard/generic input/keyboard/generic xbmc/input/mouse input/mouse diff --git a/cmake/treedata/ios/subdirs.txt b/cmake/treedata/ios/subdirs.txt index b681ed5..4bbeeb1 100644 --- a/cmake/treedata/ios/subdirs.txt +++ b/cmake/treedata/ios/subdirs.txt @@ -13,3 +13,4 @@ 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/VideoPlayer/Process/ios cores/VideoPlayer/Process/ios diff --git a/cmake/treedata/linux/subdirs.txt b/cmake/treedata/linux/subdirs.txt index 2dc8045..1ed11f5 100644 --- a/cmake/treedata/linux/subdirs.txt +++ b/cmake/treedata/linux/subdirs.txt @@ -1,5 +1,4 @@ xbmc/linux linuxsupport -xbmc/linux/sse4 sse4 xbmc/input/linux input/linux xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic @@ -11,3 +10,4 @@ xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix xbmc/windowing/egl windowing/egl xbmc/platform/posix posix +xbmc/cores/VideoPlayer/Process/rbpi cores/VideoPlayer/Process/rbpi diff --git a/cmake/treedata/optional/common/X.txt b/cmake/treedata/optional/common/X.txt index 617ff40..26b8a90 100644 --- a/cmake/treedata/optional/common/X.txt +++ b/cmake/treedata/optional/common/X.txt @@ -1 +1,2 @@ xbmc/windowing/X11 windowing/X11 # X +xbmc/cores/VideoPlayer/Process/X11 cores/VideoPlayer/Process/X11 # X diff --git a/cmake/treedata/optional/common/gbm.txt b/cmake/treedata/optional/common/gbm.txt new file mode 100644 index 0000000..1adde93 --- /dev/null +++ b/cmake/treedata/optional/common/gbm.txt @@ -0,0 +1 @@ +xbmc/windowing/gbm windowing/gbm # GBM diff --git a/cmake/treedata/osx/subdirs.txt b/cmake/treedata/osx/subdirs.txt index f0fc5c5..a520243 100644 --- a/cmake/treedata/osx/subdirs.txt +++ b/cmake/treedata/osx/subdirs.txt @@ -10,3 +10,4 @@ xbmc/platform/darwin/osx platform_osx xbmc/filesystem/posix filesystem/posix xbmc/utils/posix utils_posix xbmc/windowing/osx windowing/osx +xbmc/cores/VideoPlayer/Process/osx cores/VideoPlayer/Process/osx diff --git a/cmake/treedata/rbpi/omxplayer.txt b/cmake/treedata/rbpi/omxplayer.txt deleted file mode 100644 index d56f1df..0000000 --- a/cmake/treedata/rbpi/omxplayer.txt +++ /dev/null @@ -1 +0,0 @@ -xbmc/cores/omxplayer cores/omxplayer diff --git a/cmake/treedata/rbpi/subdirs.txt b/cmake/treedata/rbpi/subdirs.txt deleted file mode 100644 index c98652a..0000000 --- a/cmake/treedata/rbpi/subdirs.txt +++ /dev/null @@ -1,12 +0,0 @@ -xbmc/linux linuxsupport -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/windowing/rpi windowing/rpi # EGL diff --git a/cmake/treedata/windows/subdirs.txt b/cmake/treedata/windows/subdirs.txt index e52d2f6..bdbbe1d 100644 --- a/cmake/treedata/windows/subdirs.txt +++ b/cmake/treedata/windows/subdirs.txt @@ -12,3 +12,4 @@ xbmc/utils/win32 utils_win32 xbmc/rendering/dx rendering_dx xbmc/threads/platform/win threads_win xbmc/windowing/windows windowing/windows +xbmc/cores/VideoPlayer/Process/windows cores/VideoPlayer/Process/windows -- cgit v1.2.3