Merge branch 'master' into rpi. Upgrade to Cubism 4 R3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f591f8..dc1bb34 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.13)
 
 project(MouseTrackerForCubism_project)
 

diff --git a/build.sh b/build.sh
index 74c4d25..8d99c0f 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -3,4 +3,4 @@
 mkdir -p build && cd build
 
 cmake .. -D CMAKE_BUILD_TYPE=Release
-cmake --build . -j6
+cmake --build . -j 6

diff --git a/example/demo.patch b/example/demo.patch
index 9c5f42c..af215d5 100644 (file)
--- a/example/demo.patch
+++ b/example/demo.patch
@@ -1,7 +1,10 @@
 diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
 --- ./demo_clean/CMakeLists.txt        2021-02-17 01:23:17.000000000 +0000
 +++ ./demo_dev/CMakeLists.txt  2021-06-12 17:14:36.877121318 +0100
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
+@@ -1,9 +1,9 @@
+-cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.13)
+ 
  # Set app name.
  set(APP_NAME Demo)
  # Set directory paths.
@@ -19,6 +22,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)