From 42779d972d5b312dca6b0c22aa36cf59680075b6 Mon Sep 17 00:00:00 2001 From: Adrian Iain Lam Date: Sat, 12 Jun 2021 17:07:27 +0100 Subject: [PATCH] Upgrade to Cubism 4 Release R3. No incompatible API changes. --- README.md | 6 +++--- example/build.sh | 2 +- example/demo.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bef8997..345fe15 100644 --- a/README.md +++ b/README.md @@ -67,17 +67,17 @@ if you don't have C++17 support. To build the example program: -5. Download "Cubism 4 SDK for Native R2" from the Live2D website: +5. Download "Cubism 4 SDK for Native R3" from the Live2D website: . - Extract the archive -- put the "CubismSdkForNative-4-r.2" folder under + Extract the archive -- put the "CubismSdkForNative-4-r.3" 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.2/Samples/OpenGL/thirdParty/scripts" + "example/CubismSdkForNative-4-r.3/Samples/OpenGL/thirdParty/scripts" directory and run ./setup_glew_glfw diff --git a/example/build.sh b/example/build.sh index 0aa966a..b492043 100755 --- a/example/build.sh +++ b/example/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -e mkdir -p demo_build -cp -r CubismSdkForNative-4-r.2/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/ +cp -r CubismSdkForNative-4-r.3/Samples/OpenGL/Demo/proj.linux.cmake/* ./demo_build/ patch -d demo_build -p2 < demo.patch ./demo_build/scripts/make_gcc diff --git a/example/demo.patch b/example/demo.patch index 9d21f43..3a0143a 100644 --- a/example/demo.patch +++ b/example/demo.patch @@ -1,12 +1,12 @@ 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-05-16 01:44:30.838853280 +0100 ++++ ./demo_dev/CMakeLists.txt 2021-06-12 17:02:27.101948990 +0100 @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) # Set app name. 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.2) ++set(SDK_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../CubismSdkForNative-4-r.3) set(CORE_PATH ${SDK_ROOT_PATH}/Core) set(FRAMEWORK_PATH ${SDK_ROOT_PATH}/Framework) set(THIRD_PARTY_PATH ${SDK_ROOT_PATH}/Samples/OpenGL/thirdParty) -- 2.7.4