[godot] Clean-up, properly point to editor binaries in .gdextension file.

2026-02-06 23:34:53 +08:00 · 2024-10-08 17:16:20 +02:00 · 2024-10-08 17:16:20 +02:00 · a3fa4e926f
commit a3fa4e926f
parent 687a6959bb
13 changed files with 30 additions and 259 deletions
--- 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
--- a/spine-godot/.idea/.DS_Store
+++ b/spine-godot/.idea/.DS_Store
--- a/spine-godot/.idea/.gitignore
+++ b/spine-godot/.idea/.gitignore
@ -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/
--- a/spine-godot/.idea/codeStyles/Project.xml
+++ b/spine-godot/.idea/codeStyles/Project.xml
@ -1,12 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <clangFormatSettings>
-      <option name="ENABLED" value="true" />
-    </clangFormatSettings>
-    <codeStyleSettings language="ObjectiveC">
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/spine-godot/.idea/codeStyles/codeStyleConfig.xml
+++ b/spine-godot/.idea/codeStyles/codeStyleConfig.xml
@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/spine-godot/.idea/customTargets.xml
+++ b/spine-godot/.idea/customTargets.xml
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CLionExternalBuildManager">
-    <target id="649fccdb-6ca9-44f9-b3ad-0a96fbf1aa95" name="scons debug macOS/Linux" defaultType="TOOL">
-      <configuration id="ec887365-2a57-4577-a74a-2eef17526450" name="scons debug macOS/Linux">
-        <build type="TOOL">
-          <tool actionId="Tool_External Tools_scons build macOS/Linux" />
-        </build>
-        <clean type="TOOL">
-          <tool actionId="Tool_External Tools_scons clean macOS/Linux" />
-        </clean>
-      </configuration>
-    </target>
-    <target id="5f223991-e6a3-42b3-8dfc-60e7778315cc" name="scons debug Windows" defaultType="TOOL">
-      <configuration id="5c8a6190-ee50-4706-8281-c53f9f31f52b" name="scons debug Windows">
-        <build type="TOOL">
-          <tool actionId="Tool_External Tools_scons build Windows" />
-        </build>
-        <clean type="TOOL">
-          <tool actionId="Tool_External Tools_scons clean Windows" />
-        </clean>
-      </configuration>
-    </target>
-  </component>
-</project>
--- a/spine-godot/.idea/inspectionProfiles/Project_Default.xml
+++ b/spine-godot/.idea/inspectionProfiles/Project_Default.xml
@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
--- a/spine-godot/.idea/misc.xml
+++ b/spine-godot/.idea/misc.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompDBSettings">
-    <option name="linkedExternalProjectsSettings">
-      <CompDBProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </CompDBProjectSettings>
-    </option>
-  </component>
-  <component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$">
-    <contentRoot DIR="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-</project>
--- a/spine-godot/.idea/tools/External
+++ b/spine-godot/.idea/tools/External
@ -1,30 +0,0 @@
-<toolSet name="External Tools">
-  <tool name="scons build macOS/Linux" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
-    <exec>
-      <option name="COMMAND" value="scons" />
-      <option name="PARAMETERS" value="target=debug use_asan=true custom_modules=&quot;../spine_godot&quot; -j8" />
-      <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
-    </exec>
-  </tool>
-  <tool name="scons clean macOS/Linux" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
-    <exec>
-      <option name="COMMAND" value="scons" />
-      <option name="PARAMETERS" value="-c" />
-      <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
-    </exec>
-  </tool>
-  <tool name="scons build Windows" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
-    <exec>
-      <option name="COMMAND" value="scons.cmd" />
-      <option name="PARAMETERS" value="target=debug custom_modules=&quot;../spine_godot&quot; -j8" />
-      <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
-    </exec>
-  </tool>
-  <tool name="scons clean Windows" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
-    <exec>
-      <option name="COMMAND" value="scons.cmd" />
-      <option name="PARAMETERS" value="-c" />
-      <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
-    </exec>
-  </tool>
-</toolSet>
--- a/spine-godot/.idea/vcs.xml
+++ b/spine-godot/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/spine-godot/.idea/workspace.xml
+++ b/spine-godot/.idea/workspace.xml
@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
-    <generated />
-  </component>
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="3a369930-123f-48c2-867a-686d5997891d" name="Default Changelist" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CompDBLocalSettings">
-    <option name="availableProjects">
-      <map>
-        <entry>
-          <key>
-            <ExternalProjectPojo>
-              <option name="name" value="godot" />
-              <option name="path" value="$PROJECT_DIR$" />
-            </ExternalProjectPojo>
-          </key>
-          <value>
-            <list>
-              <ExternalProjectPojo>
-                <option name="name" value="godot" />
-                <option name="path" value="$PROJECT_DIR$" />
-              </ExternalProjectPojo>
-            </list>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="projectSyncType">
-      <map>
-        <entry key="$PROJECT_DIR$" value="RE_IMPORT" />
-      </map>
-    </option>
-  </component>
-  <component name="ExternalProjectsData">
-    <projectState path="$PROJECT_DIR$">
-      <ProjectState />
-    </projectState>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="GitSEFilterConfiguration">
-    <file-type-list>
-      <filtered-out-file-type name="LOCAL_BRANCH" />
-      <filtered-out-file-type name="REMOTE_BRANCH" />
-      <filtered-out-file-type name="TAG" />
-      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
-    </file-type-list>
-  </component>
-  <component name="MacroExpansionManager">
-    <option name="directoryName" value="c2b84taq" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="1yu64nUS0zjllOk9AGzuegMkIMx" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="cf.advertisement.text.overridden" value="true" />
-    <property name="cf.first.check.clang-format" value="false" />
-    <property name="cidr.known.project.marker" value="true" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="settings.editor.selected.configurable" value="CLionExternalConfigurable" />
-  </component>
-  <component name="RunManager" selected="Custom Build Application.godot debug Windows">
-    <configuration default="true" type="GradleAppRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="com.jetbrains.cidr.cpp.gradle.execution.GradleNativeBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="godot debug Linux" type="CLionExternalRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--editor --path $ProjectFileDir$/../example" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="godot" TARGET_NAME="scons debug macOS/Linux" CONFIG_NAME="scons debug macOS/Linux" RUN_PATH="$PROJECT_DIR$/bin/godot.linux.tools.64s">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="godot debug Windows" type="CLionExternalRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--editor --path $ProjectFileDir$/../example" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="godot" TARGET_NAME="scons debug Windows" CONFIG_NAME="scons debug Windows" RUN_PATH="$PROJECT_DIR$/bin/godot.windows.tools.64.exe">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="godot debug macOS" type="CLionExternalRunConfiguration" factoryName="Application" PROGRAM_PARAMS="--editor --path $ProjectFileDir$/../example" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="godot" TARGET_NAME="scons debug macOS/Linux" CONFIG_NAME="scons debug macOS/Linux" RUN_PATH="$PROJECT_DIR$/bin/godot.osx.tools.64s">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-      </method>
-    </configuration>
-    <list>
-      <item itemvalue="Custom Build Application.godot debug macOS" />
-      <item itemvalue="Custom Build Application.godot debug Linux" />
-      <item itemvalue="Custom Build Application.godot debug Windows" />
-    </list>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="3a369930-123f-48c2-867a-686d5997891d" name="Default Changelist" comment="" />
-      <created>1633088939732</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1633088939732</updated>
-      <workItem from="1633088942825" duration="326000" />
-      <workItem from="1649519095761" duration="518000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
-          <url>file://$PROJECT_DIR$/../spine_godot/register_types.cpp</url>
-          <line>76</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-</project>
--- 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"
--- 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"