diff options
| author | Cris Silva <hudokkow@gmail.com> | 2017-04-11 09:12:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 09:12:04 +0100 |
| commit | 7392884f11c8d0c731ebb6087360341a3ed651f1 (patch) | |
| tree | b26131b73b046fe7a342da07e0e003357399ffec | |
| parent | abe55b836006c4f4323d71da20a92cbc3ae9546d (diff) | |
| parent | 2832af27c1248a32fe5e5b3b4c045b5ba5ba9da9 (diff) | |
Merge pull request #11834 from hudokkow/cmake_ocd
[cmake] Spring cleanup aka OCD
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/scripts/common/PrepareEnv.cmake | 5 | ||||
| -rw-r--r-- | tools/EventClients/Clients/OSXRemote/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/depends/native/TexturePacker/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | version.txt | 2 | ||||
| -rw-r--r-- | xbmc/addons/addon-bindings.mk | 89 |
6 files changed, 53 insertions, 60 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ff1865e3..6d38cbab82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,10 +468,7 @@ endif() # Prepare add-on build env core_file_read_filtered(bindings ${CMAKE_SOURCE_DIR}/xbmc/addons/addon-bindings.mk) -foreach(binding ${bindings}) - string(REPLACE " =" ";" binding "${binding}") - string(REPLACE "+=" ";" binding "${binding}") - list(GET binding 1 header) +foreach(header ${bindings}) get_filename_component(file ${header} NAME) configure_file(${CMAKE_SOURCE_DIR}/${header} ${CORE_BUILD_DIR}/include/${APP_NAME_LC}/${file} COPYONLY) endforeach() diff --git a/cmake/scripts/common/PrepareEnv.cmake b/cmake/scripts/common/PrepareEnv.cmake index 6ecf121bb1..aa6c30b5a8 100644 --- a/cmake/scripts/common/PrepareEnv.cmake +++ b/cmake/scripts/common/PrepareEnv.cmake @@ -43,10 +43,7 @@ file(COPY ${CORE_SOURCE_DIR}/cmake/scripts/common/AddonHelpers.cmake ### copy all the addon binding header files to include/kodi # parse addon-bindings.mk to get the list of header files to copy core_file_read_filtered(bindings ${CORE_SOURCE_DIR}/xbmc/addons/addon-bindings.mk) -foreach(binding ${bindings}) - string(REPLACE " =" ";" binding "${binding}") - string(REPLACE "+=" ";" binding "${binding}") - list(GET binding 1 header) +foreach(header ${bindings}) # copy the header file to include/kodi configure_file(${CORE_SOURCE_DIR}/${header} ${APP_INCLUDE_DIR} COPYONLY) endforeach() diff --git a/tools/EventClients/Clients/OSXRemote/CMakeLists.txt b/tools/EventClients/Clients/OSXRemote/CMakeLists.txt index 4c6ed45948..7579ec458c 100644 --- a/tools/EventClients/Clients/OSXRemote/CMakeLists.txt +++ b/tools/EventClients/Clients/OSXRemote/CMakeLists.txt @@ -1,8 +1,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) -set(SOURCES xbmchelper_main.mm +set(SOURCES xbmcclientwrapper.mm + xbmchelper_main.mm XBMCHelper.m - xbmcclientwrapper.mm HIDRemote/HIDRemote.m) set(HEADERS XBMCDebugHelpers.h) diff --git a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt index 050ee10f07..102dd7a14c 100644 --- a/tools/depends/native/TexturePacker/CMakeLists.txt +++ b/tools/depends/native/TexturePacker/CMakeLists.txt @@ -26,13 +26,13 @@ else() endif() set(SOURCES src/md5.cpp - src/XBTFWriter.cpp - src/TexturePacker.cpp src/DecoderManager.cpp + src/TexturePacker.cpp + src/XBTFWriter.cpp + src/decoder/GIFDecoder.cpp + src/decoder/GifHelper.cpp src/decoder/JPGDecoder.cpp src/decoder/PNGDecoder.cpp - src/decoder/GifHelper.cpp - src/decoder/GIFDecoder.cpp ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) set(CMAKE_POSITITION_INDEPENDENT_CODE 1) diff --git a/version.txt b/version.txt index aeafffa3f0..d828028556 100644 --- a/version.txt +++ b/version.txt @@ -8,5 +8,3 @@ VERSION_CODE 179701 ADDON_API 17.9.701 APP_PACKAGE org.xbmc.kodi -# Notes: -# Change AC_INIT in configure.ac diff --git a/xbmc/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk index aa2525b9b0..cb3a681d75 100644 --- a/xbmc/addons/addon-bindings.mk +++ b/xbmc/addons/addon-bindings.mk @@ -1,46 +1,47 @@ # Please also update bindings in ../../cmake/scripts/linux/Install.cmake -# TODO: Cleanup file after autotools is gone +# Keep this in alphabetical order + +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h +xbmc/cores/AudioEngine/Utils/AEChannelData.h +xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h +xbmc/filesystem/IFileTypes.h +xbmc/input/XBMC_vkeys.h -BINDINGS =xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_imagedec_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_game.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h -BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h -BINDINGS+=xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -BINDINGS+=xbmc/cores/AudioEngine/Utils/AEChannelData.h -BINDINGS+=xbmc/filesystem/IFileTypes.h -BINDINGS+=xbmc/input/XBMC_vkeys.h |