From a3fa4e926f049d7683f78bac73a72e32125bfb5e Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 8 Oct 2024 17:16:20 +0200 Subject: [PATCH] [godot] Clean-up, properly point to editor binaries in .gdextension file. --- .gitignore | 1 + spine-godot/.idea/.DS_Store | Bin 6148 -> 0 bytes spine-godot/.idea/.gitignore | 8 - spine-godot/.idea/codeStyles/Project.xml | 12 -- .../.idea/codeStyles/codeStyleConfig.xml | 5 - spine-godot/.idea/customTargets.xml | 25 --- .../inspectionProfiles/Project_Default.xml | 6 - spine-godot/.idea/misc.xml | 19 --- spine-godot/.idea/tools/External Tools.xml | 30 ---- spine-godot/.idea/vcs.xml | 6 - spine-godot/.idea/workspace.xml | 147 ------------------ .../bin/spine_godot_extension.gdextension | 16 +- spine-godot/spine_godot_extension.gdextension | 14 ++ 13 files changed, 30 insertions(+), 259 deletions(-) delete mode 100644 spine-godot/.idea/.DS_Store delete mode 100644 spine-godot/.idea/.gitignore delete mode 100644 spine-godot/.idea/codeStyles/Project.xml delete mode 100644 spine-godot/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 spine-godot/.idea/customTargets.xml delete mode 100644 spine-godot/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 spine-godot/.idea/misc.xml delete mode 100644 spine-godot/.idea/tools/External Tools.xml delete mode 100644 spine-godot/.idea/vcs.xml delete mode 100644 spine-godot/.idea/workspace.xml diff --git a/.gitignore b/.gitignore index 4abd1a2911..6831747483 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,4 @@ spine-godot/src spine-godot/compile_commands.json spine-godot/bin spine-godot/example-v4-extension/bin/macos/macos.framework/libspine_godot.macos.editor +spine-godot/.idea diff --git a/spine-godot/.idea/.DS_Store b/spine-godot/.idea/.DS_Store deleted file mode 100644 index 6ee6e1ade48ef28e3ae63b8377061abc8d569fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHLy-ve05dK_>D5XQi#OPP(8-yzCNPPj+mY+&#Q&AY$A~v3ciIItgffwL;SorR2 zl|)IUvLIC5RrY6}@8Y{piZ3nzH@u$?fIff@n_#=ku0dp7T1{F}(<3^4#t3(KK!!`K zYSyMO28@CK#(=!LT}+T;%D1-k{$|&M(IlTQL%^+*O?LAA3!LMYc*U8XJJq=HwXI({kHgn>9$W1>&wujz zt#36?Ift>&+;aXhtg6`@JXTlBF~7g9V=noZBWt#3*k58W*?k6Bvqd^b0j)O%i~(a{ z&48Q_o=q@`SOnCggPmRhh;6D>IMy0Q^r9dp5sQG-P+V{&23Hra7%sR|@1tE3u?QI4 z;dEy{C+_Ux4aMp1)O$6DO9EPN3>X7d2KK_VFZKUy^Zmc-WHV#H7}zNWTss}5L#7mK yYb`mcwVv&QO+@U9fa=07mSY`ADVF~WRJi74KujVQ0jZ(bhk(*xoiXsI415FoF@fp; diff --git a/spine-godot/.idea/.gitignore b/spine-godot/.idea/.gitignore deleted file mode 100644 index 73f69e0958..0000000000 --- a/spine-godot/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/spine-godot/.idea/codeStyles/Project.xml b/spine-godot/.idea/codeStyles/Project.xml deleted file mode 100644 index 05a8cea498..0000000000 --- a/spine-godot/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/spine-godot/.idea/codeStyles/codeStyleConfig.xml b/spine-godot/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c2b..0000000000 --- a/spine-godot/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/spine-godot/.idea/customTargets.xml b/spine-godot/.idea/customTargets.xml deleted file mode 100644 index d60fe18e41..0000000000 --- a/spine-godot/.idea/customTargets.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spine-godot/.idea/inspectionProfiles/Project_Default.xml b/spine-godot/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 03d9549ea8..0000000000 --- a/spine-godot/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/spine-godot/.idea/misc.xml b/spine-godot/.idea/misc.xml deleted file mode 100644 index f2e9f7c044..0000000000 --- a/spine-godot/.idea/misc.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/spine-godot/.idea/tools/External Tools.xml b/spine-godot/.idea/tools/External Tools.xml deleted file mode 100644 index 6c49dcd9a3..0000000000 --- a/spine-godot/.idea/tools/External Tools.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spine-godot/.idea/vcs.xml b/spine-godot/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4c..0000000000 --- a/spine-godot/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/spine-godot/.idea/workspace.xml b/spine-godot/.idea/workspace.xml deleted file mode 100644 index cee7376dab..0000000000 --- a/spine-godot/.idea/workspace.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1633088939732 - - - - - - - - - - file://$PROJECT_DIR$/../spine_godot/register_types.cpp - 76 - - - - - \ No newline at end of file diff --git a/spine-godot/example-v4-extension/bin/spine_godot_extension.gdextension b/spine-godot/example-v4-extension/bin/spine_godot_extension.gdextension index cec50fdad5..7c82eb7549 100644 --- a/spine-godot/example-v4-extension/bin/spine_godot_extension.gdextension +++ b/spine-godot/example-v4-extension/bin/spine_godot_extension.gdextension @@ -5,21 +5,35 @@ compatibility_minimum = "4.1" [libraries] -macos.debug = "res://bin/macos/macos.framework/libspine_godot.macos.editor" +macos.editor = "res://bin/macos/macos.framework/libspine_godot.macos.editor" +macos.debug = "res://bin/macos/macos.framework/libspine_godot.macos.template_debug" macos.release = "res://bin/macos/macos.framework/libspine_godot.macos.template_release" + ios.debug = "res://bin/ios/ios.framework/libspine_godot.ios.template_debug" ios.release = "res://bin/ios/ios.framework/libspine_godot.ios.template_release" + +windows.editor.x86_32 = "res://bin/windows/libspine_godot.windows.editor.x86_32.dll" windows.debug.x86_32 = "res://bin/windows/libspine_godot.windows.template_debug.x86_32.dll" windows.release.x86_32 = "res://bin/windows/libspine_godot.windows.template_release.x86_32.dll" + +windows.editor.x86_64 = "res://bin/windows/libspine_godot.windows.editor.x86_64.dll" windows.debug.x86_64 = "res://bin/windows/libspine_godot.windows.template_debug.x86_64.dll" windows.release.x86_64 = "res://bin/windows/libspine_godot.windows.template_release.x86_64.dll" + +linux.editor.x86_64 = "res://bin/linux/libspine_godot.linux.editor.x86_64.so" linux.debug.x86_64 = "res://bin/linux/libspine_godot.linux.template_debug.x86_64.so" linux.release.x86_64 = "res://bin/linux/libspine_godot.linux.template_release.x86_64.so" + +linux.editor.arm64 = "res://bin/linux/libspine_godot.linux.editor.arm64.so" linux.debug.arm64 = "res://bin/linux/libspine_godot.linux.template_debug.arm64.so" linux.release.arm64 = "res://bin/linux/libspine_godot.linux.template_release.arm64.so" + +linux.editor.rv64 = "res://bin/linux/libspine_godot.linux.editor.rv64.so" linux.debug.rv64 = "res://bin/linux/libspine_godot.linux.template_debug.rv64.so" linux.release.rv64 = "res://bin/linux/libspine_godot.linux.template_release.rv64.so" + android.debug.x86_64 = "res://bin/android/libspine_godot.android.template_debug.x86_64.so" android.release.x86_64 = "res://bin/android/libspine_godot.android.template_release.x86_64.so" + android.debug.arm64 = "res://bin/android/libspine_godot.android.template_debug.arm64.so" android.release.arm64 = "res://bin/android/libspine_godot.android.template_release.arm64.so" \ No newline at end of file diff --git a/spine-godot/spine_godot_extension.gdextension b/spine-godot/spine_godot_extension.gdextension index 72bf26dca9..7c82eb7549 100644 --- a/spine-godot/spine_godot_extension.gdextension +++ b/spine-godot/spine_godot_extension.gdextension @@ -5,21 +5,35 @@ compatibility_minimum = "4.1" [libraries] +macos.editor = "res://bin/macos/macos.framework/libspine_godot.macos.editor" macos.debug = "res://bin/macos/macos.framework/libspine_godot.macos.template_debug" macos.release = "res://bin/macos/macos.framework/libspine_godot.macos.template_release" + ios.debug = "res://bin/ios/ios.framework/libspine_godot.ios.template_debug" ios.release = "res://bin/ios/ios.framework/libspine_godot.ios.template_release" + +windows.editor.x86_32 = "res://bin/windows/libspine_godot.windows.editor.x86_32.dll" windows.debug.x86_32 = "res://bin/windows/libspine_godot.windows.template_debug.x86_32.dll" windows.release.x86_32 = "res://bin/windows/libspine_godot.windows.template_release.x86_32.dll" + +windows.editor.x86_64 = "res://bin/windows/libspine_godot.windows.editor.x86_64.dll" windows.debug.x86_64 = "res://bin/windows/libspine_godot.windows.template_debug.x86_64.dll" windows.release.x86_64 = "res://bin/windows/libspine_godot.windows.template_release.x86_64.dll" + +linux.editor.x86_64 = "res://bin/linux/libspine_godot.linux.editor.x86_64.so" linux.debug.x86_64 = "res://bin/linux/libspine_godot.linux.template_debug.x86_64.so" linux.release.x86_64 = "res://bin/linux/libspine_godot.linux.template_release.x86_64.so" + +linux.editor.arm64 = "res://bin/linux/libspine_godot.linux.editor.arm64.so" linux.debug.arm64 = "res://bin/linux/libspine_godot.linux.template_debug.arm64.so" linux.release.arm64 = "res://bin/linux/libspine_godot.linux.template_release.arm64.so" + +linux.editor.rv64 = "res://bin/linux/libspine_godot.linux.editor.rv64.so" linux.debug.rv64 = "res://bin/linux/libspine_godot.linux.template_debug.rv64.so" linux.release.rv64 = "res://bin/linux/libspine_godot.linux.template_release.rv64.so" + android.debug.x86_64 = "res://bin/android/libspine_godot.android.template_debug.x86_64.so" android.release.x86_64 = "res://bin/android/libspine_godot.android.template_release.x86_64.so" + android.debug.arm64 = "res://bin/android/libspine_godot.android.template_debug.arm64.so" android.release.arm64 = "res://bin/android/libspine_godot.android.template_release.arm64.so" \ No newline at end of file