Skip to content

Commit a2770b9

Browse files
committed
refactor: rename spine-runtimes to spine-runtimes-4.2 and update to latest
1 parent c3b27d0 commit a2770b9

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

.gitmodules

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
[submodule "third_party/msdfgen"]
1414
path = third_party/msdfgen
1515
url = https://github.com/Chlumsky/msdfgen.git
16-
[submodule "third_party/spine-runtimes"]
17-
path = third_party/spine-runtimes
18-
url = https://github.com/EsotericSoftware/spine-runtimes.git
1916
[submodule "third_party/spine-runtimes-3.8"]
2017
path = third_party/spine-runtimes-3.8
2118
url = https://github.com/EsotericSoftware/spine-runtimes.git
@@ -27,3 +24,7 @@
2724
path = third_party/spine-runtimes-4.1
2825
url = https://github.com/EsotericSoftware/spine-runtimes.git
2926
branch = 4.1
27+
[submodule "third_party/spine-runtimes-4.2"]
28+
path = third_party/spine-runtimes-4.2
29+
url = https://github.com/EsotericSoftware/spine-runtimes.git
30+
branch = 4.2

.vscode/c_cpp_properties.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"${workspaceFolder}/third_party/glfw/include",
1010
"${workspaceFolder}/third_party/glad/include",
1111
"${workspaceFolder}/third_party/stb",
12-
"${workspaceFolder}/third_party/spine-runtimes/spine-c/spine-c/include",
12+
"${workspaceFolder}/third_party/spine-runtimes-4.2/spine-c/spine-c/include",
1313
"${workspaceFolder}/third_party/nlohmann",
1414
"${workspaceFolder}/third_party/box2d/include",
1515
"${workspaceFolder}/build/quickjs_headers"
@@ -33,7 +33,7 @@
3333
"${workspaceFolder}/third_party/glfw/include",
3434
"${workspaceFolder}/third_party/glad/include",
3535
"${workspaceFolder}/third_party/stb",
36-
"${workspaceFolder}/third_party/spine-runtimes/spine-c/spine-c/include",
36+
"${workspaceFolder}/third_party/spine-runtimes-4.2/spine-c/spine-c/include",
3737
"${workspaceFolder}/third_party/nlohmann",
3838
"${workspaceFolder}/third_party/box2d/include",
3939
"${workspaceFolder}/build/quickjs_headers"
@@ -56,7 +56,7 @@
5656
"${workspaceFolder}/include",
5757
"${workspaceFolder}/third_party/glm",
5858
"${workspaceFolder}/third_party/stb",
59-
"${workspaceFolder}/third_party/spine-runtimes/spine-c/spine-c/include",
59+
"${workspaceFolder}/third_party/spine-runtimes-4.2/spine-c/spine-c/include",
6060
"${workspaceFolder}/third_party/nlohmann",
6161
"${workspaceFolder}/third_party/box2d/include"
6262
],

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,14 +335,14 @@ html,body{width:100%;height:100%;overflow:hidden;background:#1a1a1a}
335335
# Spine standalone WASM module (spine-c)
336336
if(ES_ENABLE_SPINE)
337337
file(GLOB_RECURSE SPINE_MODULE_SPINE_SOURCES
338-
"${CMAKE_CURRENT_SOURCE_DIR}/third_party/spine-runtimes/spine-c/spine-c/src/spine/*.c"
338+
"${CMAKE_CURRENT_SOURCE_DIR}/third_party/spine-runtimes-4.2/spine-c/spine-c/src/spine/*.c"
339339
)
340340
add_executable(spine_module
341341
src/esengine/bindings/SpineModuleEntry.cpp
342342
${SPINE_MODULE_SPINE_SOURCES}
343343
)
344344
target_include_directories(spine_module PRIVATE
345-
${CMAKE_CURRENT_SOURCE_DIR}/third_party/spine-runtimes/spine-c/spine-c/include
345+
${CMAKE_CURRENT_SOURCE_DIR}/third_party/spine-runtimes-4.2/spine-c/spine-c/include
346346
)
347347
es_apply_spine_module_settings(spine_module)
348348

third_party/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ target_include_directories(nlohmann_json INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/n
1212
if(ES_ENABLE_SPINE)
1313
set(SPINE_SET_COMPILER_FLAGS OFF CACHE BOOL "" FORCE)
1414
file(GLOB_RECURSE SPINE_SOURCES
15-
"${CMAKE_CURRENT_SOURCE_DIR}/spine-runtimes/spine-cpp/spine-cpp/src/spine/*.cpp"
15+
"${CMAKE_CURRENT_SOURCE_DIR}/spine-runtimes-4.2/spine-cpp/spine-cpp/src/spine/*.cpp"
1616
)
1717
add_library(spine-cpp STATIC ${SPINE_SOURCES})
1818
target_include_directories(spine-cpp PUBLIC
19-
${CMAKE_CURRENT_SOURCE_DIR}/spine-runtimes/spine-cpp/spine-cpp/include
19+
${CMAKE_CURRENT_SOURCE_DIR}/spine-runtimes-4.2/spine-cpp/spine-cpp/include
2020
)
2121
target_compile_definitions(spine-cpp PUBLIC SPINE_SHORT_NAMES)
2222
if(NOT MSVC)

third_party/spine-runtimes

Lines changed: 0 additions & 1 deletion
This file was deleted.

third_party/spine-runtimes-4.2

Submodule spine-runtimes-4.2 added at 13ad9fe

0 commit comments

Comments
 (0)