From b277deb26b12f65b4f35bf973fdc8ef5f6fcb1c9 Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Mon, 11 Apr 2022 10:37:07 +0200
Subject: [PATCH] [godot] Fix CLion config files for Windows.

---
 spine-godot/.idea/customTargets.xml           | 18 +++++++---
 spine-godot/.idea/tools/External Tools.xml    | 18 ++++++++--
 spine-godot/.idea/workspace.xml               | 33 +++++++++++++++++--
 .../assets/raptor/raptor-data-new.tres        | 10 ------
 spine-godot/setup.bat                         |  2 +-
 5 files changed, 62 insertions(+), 19 deletions(-)
 delete mode 100644 spine-godot/example/assets/raptor/raptor-data-new.tres

diff --git a/spine-godot/.idea/customTargets.xml b/spine-godot/.idea/customTargets.xml
index 9a3229956..d60fe18e4 100644
--- a/spine-godot/.idea/customTargets.xml
+++ b/spine-godot/.idea/customTargets.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CLionExternalBuildManager">
-    <target id="649fccdb-6ca9-44f9-b3ad-0a96fbf1aa95" name="scons debug" defaultType="TOOL">
-      <configuration id="ec887365-2a57-4577-a74a-2eef17526450" name="scons debug">
+    <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 debug" />
+          <tool actionId="Tool_External Tools_scons build macOS/Linux" />
         </build>
         <clean type="TOOL">
-          <tool actionId="Tool_External Tools_scons clean" />
+          <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>
diff --git a/spine-godot/.idea/tools/External Tools.xml b/spine-godot/.idea/tools/External Tools.xml
index e8ef4983b..01aef4873 100644
--- a/spine-godot/.idea/tools/External Tools.xml	
+++ b/spine-godot/.idea/tools/External Tools.xml	
@@ -1,16 +1,30 @@
 <toolSet name="External Tools">
-  <tool name="scons debug" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
+  <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 custom_modules=&quot;../spine_godot&quot; -j8" />
       <option name="WORKING_DIRECTORY" value="$ProjectFileDir$" />
     </exec>
   </tool>
-  <tool name="scons clean" showInMainMenu="false" showInEditor="false" showInProject="false" showInSearchPopup="false" disabled="false" useConsole="true" showConsoleOnStdOut="false" showConsoleOnStdErr="false" synchronizeAfterRun="true">
+  <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>
\ No newline at end of file
diff --git a/spine-godot/.idea/workspace.xml b/spine-godot/.idea/workspace.xml
index 9478bbd3e..a9d4a1289 100644
--- a/spine-godot/.idea/workspace.xml
+++ b/spine-godot/.idea/workspace.xml
@@ -61,6 +61,9 @@
       <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>
@@ -82,13 +85,23 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="settings.editor.selected.configurable" value="CLionExternalConfigurable" />
   </component>
-  <component name="RunManager">
+  <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" 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" CONFIG_NAME="scons debug" RUN_PATH="$PROJECT_DIR$/bin/godot.osx.tools.64">
+    <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.64">
+      <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.64">
       <method v="2">
         <option name="CLION.EXTERNAL.BUILD" enabled="true" />
       </method>
@@ -98,6 +111,11 @@
         <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">
@@ -115,4 +133,15 @@
   <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>
\ No newline at end of file
diff --git a/spine-godot/example/assets/raptor/raptor-data-new.tres b/spine-godot/example/assets/raptor/raptor-data-new.tres
deleted file mode 100644
index 18a042c08..000000000
--- a/spine-godot/example/assets/raptor/raptor-data-new.tres
+++ /dev/null
@@ -1,10 +0,0 @@
-[gd_resource type="SpineNewSkeletonDataResource" load_steps=3 format=2]
-
-[ext_resource path="res://assets/raptor/raptor.atlas" type="SpineAtlasResource" id=1]
-[ext_resource path="res://assets/raptor/raptor-pro.skel" type="SpineSkeletonFileResource" id=2]
-
-[resource]
-atlas_res = ExtResource( 1 )
-skeleton_file_res = ExtResource( 2 )
-animations = null
-skins = null
diff --git a/spine-godot/setup.bat b/spine-godot/setup.bat
index 5b08527d9..761427e05 100644
--- a/spine-godot/setup.bat
+++ b/spine-godot/setup.bat
@@ -4,4 +4,4 @@ git clone --depth 1 https://github.com/godotengine/godot.git -b 3.4.4-stable
 xcopy /E /I .idea godot\.idea
 copy custom.py godot
 xcopy /E /I ..\spine-cpp\spine-cpp spine_godot\spine-cpp
-cd godot & scons target=debug compiledb custom_modules=../spine_godot --jobs=8 & scons target=debug custom_modules=../spine_godot --jobs=8 & cd ..
+cd godot & scons target=debug custom_modules=../spine_godot vsproj=yes --jobs=8 & cd ..