mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-19 00:06:42 +08:00
[godot] Fix v3 Live++ patch, launch configs and tasks.
This commit is contained in:
badlogic
parent
35c4294a9c
commit
0b5621ccd4
43
spine-godot/.vscode/launch.json
vendored
43
spine-godot/.vscode/launch.json
vendored
@ -34,14 +34,51 @@
|
||||
"type": "cppvsdbg",
|
||||
"request": "launch",
|
||||
"name": "debug scene v3",
|
||||
"program": "godot/bin/godot.windows.editor.dev.x86_64.exe",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"program": "godot/bin/godot.windows.tools.64.exe",
|
||||
"args": [
|
||||
"--path",
|
||||
"example",
|
||||
"examples/01-helloworld/helloworld.tscn"
|
||||
],
|
||||
"preLaunchTask": "build-v3",
|
||||
"linux": {
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"name": "debug scene v3",
|
||||
"program": "godot/bin/godot.windows.tools.64.exe",
|
||||
},
|
||||
"osx": {
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"name": "debug scene v3",
|
||||
"program": "godot/bin/godot.tools.64.exe",
|
||||
},
|
||||
},
|
||||
{
|
||||
"type": "cppvsdbg",
|
||||
"request": "launch",
|
||||
"name": "debug editor v3",
|
||||
"program": "godot/bin/godot.windows.tools.64.exe",
|
||||
"args": [
|
||||
"-e",
|
||||
"--path",
|
||||
"example",
|
||||
],
|
||||
"cwd": "${workspaceFolder}",
|
||||
"preLaunchTask": "build-v3"
|
||||
}
|
||||
"preLaunchTask": "build-v3",
|
||||
"linux": {
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"name": "debug editor v3",
|
||||
"program": "godot/bin/godot.windows.tools.64.exe",
|
||||
},
|
||||
"osx": {
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"name": "debug editor v3",
|
||||
"program": "godot/bin/godot.tools.64.exe",
|
||||
},
|
||||
},
|
||||
]
|
||||
}
|
||||
14
spine-godot/.vscode/tasks.json
vendored
14
spine-godot/.vscode/tasks.json
vendored
@ -10,7 +10,7 @@
|
||||
"cwd": "${workspaceFolder}/godot"
|
||||
},
|
||||
"args": [
|
||||
"-j 8",
|
||||
"-j 16",
|
||||
"dev_build=yes",
|
||||
"custom_modules=\"${workspaceFolder}/spine_godot"
|
||||
],
|
||||
@ -25,10 +25,18 @@
|
||||
"cwd": "${workspaceFolder}/godot"
|
||||
},
|
||||
"args": [
|
||||
"-j 8",
|
||||
"debug",
|
||||
"-j 16",
|
||||
"target=debug",
|
||||
"custom_modules=\"${workspaceFolder}/spine_godot"
|
||||
],
|
||||
"windows": {
|
||||
"args": [
|
||||
"-j 16",
|
||||
"target=debug",
|
||||
"custom_modules=\"${workspaceFolder}/spine_godot",
|
||||
"livepp=${env:LIVEPP}"
|
||||
]
|
||||
},
|
||||
"problemMatcher": "$msCompile"
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
diff --git a/methods.py b/methods.py
|
||||
index 9b8cb38c0c1c0fd4ba2917815fdfb7efafb4b646..874e10bcc637632db26b4ac062a5359cd44eaa25 100644
|
||||
index 436fe63..d6c81b9 100644
|
||||
--- a/methods.py
|
||||
+++ b/methods.py
|
||||
@@ -688,6 +688,7 @@ def generate_vs_project(env, num_jobs):
|
||||
"target=$(Configuration)",
|
||||
"progress=no",
|
||||
"tools=!tools!",
|
||||
+ "livepp=%s" % env["livepp"],
|
||||
"-j%s" % num_jobs,
|
||||
]
|
||||
@@ -782,6 +782,7 @@ def generate_vs_project(env, num_jobs):
|
||||
f"target={configuration_getter}",
|
||||
"progress=no",
|
||||
"tools=!tools!",
|
||||
+ "livepp=%s" % env["livepp"],
|
||||
"-j%s" % num_jobs,
|
||||
]
|
||||
|
||||
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
|
||||
index e4facad816b7584fe38dc760356310e0a3937288..2d9da3df65cd3a0b0882ace984002320ebf6c3fc 100644
|
||||
index e6829ae..3a7e38d 100644
|
||||
--- a/platform/windows/detect.py
|
||||
+++ b/platform/windows/detect.py
|
||||
@@ -44,7 +44,7 @@ def can_build():
|
||||
@ -23,7 +23,7 @@ index e4facad816b7584fe38dc760356310e0a3937288..2d9da3df65cd3a0b0882ace984002320
|
||||
|
||||
mingw32 = ""
|
||||
mingw64 = ""
|
||||
@@ -72,6 +72,7 @@ def get_opts():
|
||||
@@ -73,6 +73,7 @@ def get_opts():
|
||||
BoolVariable("use_thinlto", "Use ThinLTO", False),
|
||||
BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True),
|
||||
BoolVariable("use_asan", "Use address sanitizer (ASAN)", False),
|
||||
@ -31,7 +31,7 @@ index e4facad816b7584fe38dc760356310e0a3937288..2d9da3df65cd3a0b0882ace984002320
|
||||
]
|
||||
|
||||
|
||||
@@ -296,6 +297,18 @@ def configure_msvc(env, manual_msvc_config):
|
||||
@@ -305,6 +306,22 @@ def configure_msvc(env, manual_msvc_config):
|
||||
|
||||
env.AppendUnique(LINKFLAGS=["/STACK:" + str(STACK_SIZE)])
|
||||
|
||||
@ -39,19 +39,23 @@ index e4facad816b7584fe38dc760356310e0a3937288..2d9da3df65cd3a0b0882ace984002320
|
||||
+ # some sanity checks.
|
||||
+ if env.get("livepp"):
|
||||
+ if env["target"] == "release_debug" or env["target"] == "debug":
|
||||
+ print("Found Live++ at %s" % env.get("livepp"))
|
||||
+ env.AppendUnique(CPPDEFINES=["LIVEPP_PATH=%s" % env.get("livepp")])
|
||||
+ env.AppendUnique(CPPPATH=[env.get("livepp")])
|
||||
+ env.AppendUnique(LINKFLAGS=["/FUNCTIONPADMIN"])
|
||||
+ if os.path.exists(env.get("livepp")):
|
||||
+ print("Found Live++ at %s" % env.get("livepp"))
|
||||
+ env.AppendUnique(CPPDEFINES=["LIVEPP_PATH=%s" % env.get("livepp")])
|
||||
+ env.AppendUnique(CPPPATH=[env.get("livepp")])
|
||||
+ env.AppendUnique(LINKFLAGS=["/FUNCTIONPADMIN"])
|
||||
+ else:
|
||||
+ printf("Specified Live++ path does not exist")
|
||||
+ else:
|
||||
+ print("Live++ can only be used with targets 'debug' and 'release_debug'")
|
||||
+ else:
|
||||
+ print("No Live++ specified.")
|
||||
+
|
||||
|
||||
def configure_mingw(env):
|
||||
# Workaround for MinGW. See:
|
||||
diff --git a/platform/windows/godot_windows.cpp b/platform/windows/godot_windows.cpp
|
||||
index d7d9e4eace00a696abbb47cb9632f40e183a4ec4..e362320e51c725cd01f292887bd93442752c1c48 100644
|
||||
index ef70c33..957158e 100644
|
||||
--- a/platform/windows/godot_windows.cpp
|
||||
+++ b/platform/windows/godot_windows.cpp
|
||||
@@ -34,6 +34,11 @@
|
||||
@ -66,7 +70,7 @@ index d7d9e4eace00a696abbb47cb9632f40e183a4ec4..e362320e51c725cd01f292887bd93442
|
||||
// For export templates, add a section; the exporter will patch it to enclose
|
||||
// the data appended to the executable (bundled PCK)
|
||||
#ifndef TOOLS_ENABLED
|
||||
@@ -136,6 +141,16 @@ char *wc_to_utf8(const wchar_t *wc) {
|
||||
@@ -147,6 +152,16 @@ char *wc_to_utf8(const wchar_t *wc) {
|
||||
}
|
||||
|
||||
__declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
||||
@ -83,7 +87,7 @@ index d7d9e4eace00a696abbb47cb9632f40e183a4ec4..e362320e51c725cd01f292887bd93442
|
||||
OS_Windows os(NULL);
|
||||
|
||||
setlocale(LC_CTYPE, "");
|
||||
@@ -170,6 +185,11 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
||||
@@ -180,6 +195,11 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
||||
}
|
||||
delete[] argv_utf8;
|
||||
|
||||
@ -96,7 +100,7 @@ index d7d9e4eace00a696abbb47cb9632f40e183a4ec4..e362320e51c725cd01f292887bd93442
|
||||
};
|
||||
|
||||
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
|
||||
index 8b28cbf1f23d6574aac41a3676fea64ddf786fc4..0124d4ac9652df9ba682ab8cc18b4008461d74cf 100644
|
||||
index 4977d11..6642be9 100644
|
||||
--- a/platform/windows/os_windows.cpp
|
||||
+++ b/platform/windows/os_windows.cpp
|
||||
@@ -53,6 +53,11 @@
|
||||
@ -111,7 +115,7 @@ index 8b28cbf1f23d6574aac41a3676fea64ddf786fc4..0124d4ac9652df9ba682ab8cc18b4008
|
||||
static const WORD MAX_CONSOLE_LINES = 1500;
|
||||
|
||||
extern "C" {
|
||||
@@ -3371,6 +3376,9 @@ void OS_Windows::run() {
|
||||
@@ -3542,6 +3547,9 @@ void OS_Windows::run() {
|
||||
process_events(); // get rid of pending events
|
||||
if (Main::iteration())
|
||||
break;
|
||||
|
||||
@ -29,8 +29,13 @@ if [ $dev = "true" ]; then
|
||||
|
||||
if [ "$OSTYPE" = "msys" ]; then
|
||||
pushd godot
|
||||
git apply ../build/livepp.patch
|
||||
git apply ../build/livepp-v4.patch
|
||||
if [[ $branch == 3* ]]; then
|
||||
echo "Applying V3 Live++ patch"
|
||||
git apply ../build/livepp.patch
|
||||
else
|
||||
echo "Applying V4 Live++ patch"
|
||||
git apply ../build/livepp-v4.patch
|
||||
fi
|
||||
popd
|
||||
fi
|
||||
|
||||
|
||||
@ -31,9 +31,9 @@
|
||||
#include "SpineEditorPlugin.h"
|
||||
#include "SpineAtlasResource.h"
|
||||
#include "SpineSkeletonFileResource.h"
|
||||
#include "editor/editor_undo_redo_manager.h"
|
||||
|
||||
#if VERSION_MAJOR > 3
|
||||
#include "editor/editor_undo_redo_manager.h"
|
||||
Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
|
||||
#else
|
||||
Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user