Skip to content

Commit ffdbef4

Browse files
authored
Merge pull request #187 from defold/fix-spine-libs
Fix crash, and rebuild spine libs
2 parents 4d9c0e0 + 0d2454d commit ffdbef4

File tree

18 files changed

+3
-2
lines changed

18 files changed

+3
-2
lines changed
-859 KB
Binary file not shown.
-740 KB
Binary file not shown.
-740 KB
Binary file not shown.
-586 KB
Binary file not shown.

defold-spine/lib/js-web/libspinec.a

-565 KB
Binary file not shown.

defold-spine/lib/wasm-web/libspinec.a

-565 KB
Binary file not shown.

defold-spine/lib/x86-win32/spinec.lib

-561 KB
Binary file not shown.
-767 KB
Binary file not shown.
-744 KB
Binary file not shown.
-767 KB
Binary file not shown.
-545 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.

defold-spine/src/res_spine_scene.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ namespace dmSpine
129129
spAnimationStateData_dispose(resource->m_AnimationStateData);
130130
if (resource->m_Skeleton)
131131
spSkeletonData_dispose(resource->m_Skeleton);
132-
dmSpine::Dispose(resource->m_AttachmentLoader);
132+
if (resource->m_AttachmentLoader)
133+
dmSpine::Dispose(resource->m_AttachmentLoader);
133134
delete[] resource->m_Regions;
134135
}
135136

utils/build_libs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ for platform in $PLATFORMS; do
8787
EXT_SETTINGS=./build/ext.settings
8888
echo "[native_extension]" > ${EXT_SETTINGS}
8989
echo "app_manifest =" >> ${EXT_SETTINGS}
90-
java -jar $BOB --platform=$platform --architectures=$platform --settings=${EXT_SETTINGS} build --build-artifacts=library --variant $VARIANT --build-server=$SERVER --defoldsdk=$DEFOLDSDK --debug-ne-upload true --ne-output-name=${LIBRARY_NAME} --ne-build-dir ${PROJECT_DIR}/src --ne-build-dir ${PROJECT_DIR}/commonsrc --ne-build-dir ${PROJECT_DIR}/include
90+
java -jar $BOB --platform=$platform --architectures=$platform --settings=${EXT_SETTINGS} build --build-artifacts=library --variant $VARIANT --build-server=$SERVER --defoldsdk=$DEFOLDSDK --debug-ne-upload true --ne-output-name=${LIBRARY_NAME} --ne-build-dir ${PROJECT_DIR}/commonsrc --ne-build-dir ${PROJECT_DIR}/include
9191
rm ${EXT_SETTINGS}
9292

9393
copy_results $platform $platform_ne ${TARGET_LIB_DIR}

0 commit comments

Comments
 (0)