Merge pull request #81 from AlwinEsch/Matrix-change

[Matrix] Fix possible compile error about missing jsoncpp include
xbmc · Sep 13, 2021 · 9ce9a46 · 9ce9a46
2 parents 43a16f0 + ecd9ff8
commit 9ce9a46
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,11 +22,11 @@ else()
 endif()
 
 include_directories(${GLM_INCLUDE_DIR}
+                    ${JSONCPP_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${PROJECT_SOURCE_DIR}/lib)
 
 list(APPEND DEPLIBS ${JSONCPP_LIBRARIES})
-list(APPEND INCLUDES ${JSONCPP_INCLUDE_DIRS})
 
 if(CORE_SYSTEM_NAME STREQUAL osx OR
    CORE_SYSTEM_NAME STREQUAL ios OR

diff --git a/visualization.shadertoy/addon.xml.in b/visualization.shadertoy/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="visualization.shadertoy"
-  version="19.1.0"
+  version="19.1.1"
   name="Shadertoy"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/visualization.shadertoy/changelog.txt b/visualization.shadertoy/changelog.txt
@@ -1,3 +1,6 @@
+[B]19.1.1[/B]
+- Fix possible compile error about missing jsoncpp include
+
 [B]19.1.0[/B]
 - Add new custom shader list feature:
   - Move existing shader list from add-on code to the default 'presets.json' file