Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TEMPORARY] Request for own review about new planned addon interface #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ cmake_install.cmake
/addons/skin.estouchy/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/audioencoder.*
/addons/web.*
/addons/pvr.*
/addons/peripheral.*
/addons/game.*
Expand Down Expand Up @@ -257,6 +258,7 @@ cmake_install.cmake
/tools/android/packaging/xbmc/strings.xml

#/tools/depends
/tools/depends/**/build
/tools/depends/**/config.cache
/tools/depends/**/config.log
/tools/depends/**/config.status
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ set(INCLUDES ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/lib
${CMAKE_SOURCE_DIR}/xbmc
${CMAKE_SOURCE_DIR}/xbmc/${PLATFORM_DIR}
${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-dev-kit
${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer
${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
Expand Down Expand Up @@ -242,6 +243,9 @@ if(ENABLE_AIRTUNES)
endif()
endif()

list(APPEND DEP_DEFINES -DDEVKIT_LIBRARY="${DEVKIT_LIBRARY}")
list(APPEND DEP_DEFINES -DDEVKIT_LAUNCH_EXE="${DEVKIT_LAUNCH_EXE}")

# find all folders containing addon.xml.in
# used to define ADDON_XML_OUTPUTS, ADDON_XML_DEPENDS and ADDON_INSTALL_DATA
# Function defined in ./cmake/scripts/common/Macros.cmake
Expand Down Expand Up @@ -342,9 +346,9 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
)
add_library(lib${APP_NAME_LC} STATIC)
add_dependencies(lib${APP_NAME_LC} compileinfo)
target_link_libraries(lib${APP_NAME_LC} PUBLIC compileinfo_obj)
target_link_libraries(lib${APP_NAME_LC} PUBLIC compileinfo_obj $<TARGET_OBJECTS:devkit_shared>)
else()
add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo>)
add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo> $<TARGET_OBJECTS:devkit_shared>)
endif()
add_dependencies(lib${APP_NAME_LC} ${GLOBAL_TARGET_DEPS})
set_target_properties(lib${APP_NAME_LC} PROPERTIES PREFIX "")
Expand Down
8 changes: 8 additions & 0 deletions addons/kodi.binary.devkit/addon.xml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="kodi.binary.devkit" version="@__KDK_MAJOR__@.@__KDK_MINOR__@" provider-name="Team Kodi">
<backwards-compatibility abi="@[email protected]"/>
<canary>@__KDK_CANARY_XML__@</canary>
<requires>
<import addon="xbmc.core" version="0.1.0"/>
</requires>
</addon>
7 changes: 0 additions & 7 deletions addons/kodi.binary.global.audioengine/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.filesystem/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.general/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.gui/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.main/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.network/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.global.tools/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.audiodecoder/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.audioencoder/addon.xml.in

This file was deleted.

8 changes: 0 additions & 8 deletions addons/kodi.binary.instance.game/addon.xml.in

This file was deleted.

17 changes: 0 additions & 17 deletions addons/kodi.binary.instance.game/controller.xsd

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.imagedecoder/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.inputstream/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.peripheral/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.pvr/addon.xml.in

This file was deleted.

Binary file removed addons/kodi.binary.instance.pvr/icon.png
Binary file not shown.
7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.screensaver/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.vfs/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.videocodec/addon.xml.in

This file was deleted.

7 changes: 0 additions & 7 deletions addons/kodi.binary.instance.visualization/addon.xml.in

This file was deleted.

Loading