From: Adrian Iain Lam <adrianiainlam@users.noreply.github.com>
Date: Sun, 12 Mar 2023 01:42:59 +0000 (+0000)
Subject: Upgrade to Cubism 4 Release R6.1. No incompatible API changes.
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=a202c85aea1554f57ee00a7e15312e241e38d71d;p=facial-landmarks-for-cubism.git

Upgrade to Cubism 4 Release R6.1. No incompatible API changes.
---

diff --git a/README.md b/README.md
index 6196581..56440e1 100644
--- a/README.md
+++ b/README.md
@@ -71,17 +71,17 @@ if you don't have C++17 support.
 
 To build the example program:
 
-5. Download "Cubism 4 SDK for Native R6" from the Live2D website:
+5. Download "Cubism 4 SDK for Native R6.1" from the Live2D website:
    <https://www.live2d.com/en/download/cubism-sdk/download-native/>.
 
-   Extract the archive -- put the "CubismSdkForNative-4-r.6" folder under
+   Extract the archive -- put the "CubismSdkForNative-4-r.6.1" folder under
    the "example" folder of this repo.
 
    Note: The Cubism SDK is the property of Live2D and is not part of this
    project. You must agree to Live2D's license agreements to use it.
 
 6. Go into the
-   "example/CubismSdkForNative-4-r.6/Samples/OpenGL/thirdParty/scripts"
+   "example/CubismSdkForNative-4-r.6.1/Samples/OpenGL/thirdParty/scripts"
    directory and run
 
        ./setup_glew_glfw
diff --git a/example/build.sh b/example/build.sh
index 9486146..b9b9d18 100755
--- a/example/build.sh
+++ b/example/build.sh
@@ -3,11 +3,11 @@
 mkdir -p demo_build
 
 if [ "$OSTYPE" = "msys" -o "$OSTYPE" = "cygwin" ]; then
-    cp -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.win.cmake/* ./demo_build/
+    cp -r CubismSdkForNative-4-r.6.1/Samples/OpenGL/Demo/proj.win.cmake/* ./demo_build/
     patch -d demo_build -p2 < demo_win.patch
     echo "Now go into ./demo_build/scripts and run the corresponding script for your MSVC version"
 else
-    cp -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/
+    cp -r CubismSdkForNative-4-r.6.1/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/
     patch -d demo_build -p2 < demo.patch
     ./demo_build/scripts/make_gcc
 fi
diff --git a/example/demo.patch b/example/demo.patch
index 8846f99..0f5df9c 100644
--- a/example/demo.patch
+++ b/example/demo.patch
@@ -6,7 +6,7 @@ diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
  set(APP_NAME Demo)
  # Set directory paths.
 -set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
-+set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.6)
++set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.6.1)
  set(CORE_PATH ${SDK_ROOT_PATH}/Core)
  set(FRAMEWORK_PATH ${SDK_ROOT_PATH}/Framework)
  set(THIRD_PARTY_PATH ${SDK_ROOT_PATH}/Samples/OpenGL/thirdParty)
diff --git a/example/demo_win.patch b/example/demo_win.patch
index a7348fd..c9794c4 100644
--- a/example/demo_win.patch
+++ b/example/demo_win.patch
@@ -6,7 +6,7 @@ diff -pruN --exclude build ./demo_clean/CMakeLists.txt ./demo_dev/CMakeLists.txt
  set(APP_NAME Demo)
  # Set directory paths.
 -set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
-+set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.6)
++set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.6.1)
  set(CORE_PATH ${SDK_ROOT_PATH}/Core)
  set(FRAMEWORK_PATH ${SDK_ROOT_PATH}/Framework)
  set(THIRD_PARTY_PATH ${SDK_ROOT_PATH}/Samples/OpenGL/thirdParty)
diff --git a/example/generate_patch.sh b/example/generate_patch.sh
index 30e66c6..13c0288 100755
--- a/example/generate_patch.sh
+++ b/example/generate_patch.sh
@@ -3,9 +3,9 @@
 mkdir -p demo_clean
 
 if [ "$OSTYPE" = "msys" -o "$OSTYPE" = "cygwin" ]; then
-    cp -p -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.win.cmake/* ./demo_clean/
+    cp -p -r CubismSdkForNative-4-r.6.1/Samples/OpenGL/Demo/proj.win.cmake/* ./demo_clean/
     diff -pruN --exclude build ./demo_clean ./demo_dev > ./demo_win.patch
 else
-    cp -p -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_clean/
+    cp -p -r CubismSdkForNative-4-r.6.1/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_clean/
     diff -pruN --exclude build ./demo_clean ./demo_dev > ./demo.patch
 fi