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

diff --git a/README.md b/README.md
index 88705cb..f6d825d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -67,17 +67,17 @@ if you don't have C++17 support.
 
 To build the example program:
 
 
 To build the example program:
 

-5. Download "Cubism 4 SDK for Native R5.1" from the Live2D website:
+5. Download "Cubism 4 SDK for Native R6" from the Live2D website:

    <https://www.live2d.com/en/download/cubism-sdk/download-native/>.
 
    <https://www.live2d.com/en/download/cubism-sdk/download-native/>.
 

-   Extract the archive -- put the "CubismSdkForNative-4-r.5.1" folder under
+   Extract the archive -- put the "CubismSdkForNative-4-r.6" 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
    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.5.1/Samples/OpenGL/thirdParty/scripts"
+   "example/CubismSdkForNative-4-r.6/Samples/OpenGL/thirdParty/scripts"

    directory and run
 
        ./setup_glew_glfw
    directory and run
 
        ./setup_glew_glfw

diff --git a/example/build.sh b/example/build.sh
index b1b789e..5649437 100755 (executable)
--- a/example/build.sh
+++ b/example/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
 mkdir -p demo_build
 #!/bin/sh -e
 
 mkdir -p demo_build

-cp -r CubismSdkForNative-4-r.5.1/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/
+cp -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/

 patch -d demo_build -p2 < demo.patch
 ./demo_build/scripts/make_gcc
 patch -d demo_build -p2 < demo.patch
 ./demo_build/scripts/make_gcc

diff --git a/example/demo.patch b/example/demo.patch
index 9c74633..8846f99 100644 (file)
--- 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(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.5.1)
++set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.6)

  set(CORE_PATH ${SDK_ROOT_PATH}/Core)
  set(FRAMEWORK_PATH ${SDK_ROOT_PATH}/Framework)
  set(THIRD_PARTY_PATH ${SDK_ROOT_PATH}/Samples/OpenGL/thirdParty)
  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 1c822b6..01ee518 100755 (executable)
--- a/example/generate_patch.sh
+++ b/example/generate_patch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 mkdir -p demo_clean
 #!/bin/sh
 
 mkdir -p demo_clean

-cp -p -r CubismSdkForNative-4-r.5.1/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_clean/
+cp -p -r CubismSdkForNative-4-r.6/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_clean/

 diff -pruN --exclude build ./demo_clean ./demo_dev > ./demo.patch
 diff -pruN --exclude build ./demo_clean ./demo_dev > ./demo.patch