Merge branch 'master' into rpi

 - Update to Cubism SDK 4-r.2. Incompatible scaling changes.
 - Add support for Cubism 2.1 style parameter IDs

diff --git a/example/demo.patch b/example/demo.patch
index 637b3ab..e7d5114 100644 (file)
--- a/example/demo.patch
+++ b/example/demo.patch
@@ -19,6 +19,15 @@ diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
  set(CMAKE_CXX_EXTENSIONS OFF)
  
+@@ -42,7 +42,7 @@ add_library(Live2DCubismCore STATIC IMPO
+ # Find library path.
+ set_target_properties(Live2DCubismCore
+   PROPERTIES
+-    IMPORTED_LOCATION ${CORE_PATH}/lib/linux/x86_64/libLive2DCubismCore.a
++    IMPORTED_LOCATION ${CORE_PATH}/lib/experimental/rpi/libLive2DCubismCore.a
+     INTERFACE_INCLUDE_DIRECTORIES ${CORE_PATH}/include
+ )
+ 
 @@ -64,6 +64,11 @@ target_link_libraries(Framework Live2DCu
  # Find opengl libraries.
  find_package(OpenGL REQUIRED)