mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-22 02:06:03 +08:00
128 lines
3.8 KiB
Diff
128 lines
3.8 KiB
Diff
diff --git a/methods.py b/methods.py
|
|
index 436fe63..d6c81b9 100644
|
|
--- a/methods.py
|
|
+++ b/methods.py
|
|
@@ -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 e6829ae..3a7e38d 100644
|
|
--- a/platform/windows/detect.py
|
|
+++ b/platform/windows/detect.py
|
|
@@ -44,7 +44,7 @@ def can_build():
|
|
|
|
|
|
def get_opts():
|
|
- from SCons.Variables import BoolVariable, EnumVariable
|
|
+ from SCons.Variables import BoolVariable, EnumVariable, PathVariable
|
|
|
|
mingw32 = ""
|
|
mingw64 = ""
|
|
@@ -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),
|
|
+ PathVariable("livepp", "Path to the Live++ installation", "", PathVariable.PathAccept),
|
|
]
|
|
|
|
|
|
@@ -305,6 +306,22 @@ def configure_msvc(env, manual_msvc_config):
|
|
|
|
env.AppendUnique(LINKFLAGS=["/STACK:" + str(STACK_SIZE)])
|
|
|
|
+ # Check if LIVEPP_PATH is set and add #define. Perform
|
|
+ # some sanity checks.
|
|
+ if env.get("livepp"):
|
|
+ if env["target"] == "release_debug" or env["target"] == "debug":
|
|
+ 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:
|
|
+ print("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 ef70c33..957158e 100644
|
|
--- a/platform/windows/godot_windows.cpp
|
|
+++ b/platform/windows/godot_windows.cpp
|
|
@@ -34,6 +34,11 @@
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
|
|
+#ifdef LIVEPP_PATH
|
|
+#include "API/LPP_API.h"
|
|
+HMODULE livePP;
|
|
+#endif
|
|
+
|
|
// For export templates, add a section; the exporter will patch it to enclose
|
|
// the data appended to the executable (bundled PCK)
|
|
#ifndef TOOLS_ENABLED
|
|
@@ -147,6 +152,16 @@ char *wc_to_utf8(const wchar_t *wc) {
|
|
}
|
|
|
|
__declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
|
+#ifdef LIVEPP_PATH
|
|
+#define _MKSTR_L(x) _STR_L(x)
|
|
+#define _STR_L(x) L#x
|
|
+ livePP = lpp::lppLoadAndRegister(_MKSTR_L(LIVEPP_PATH), "Godot");
|
|
+ lpp::lppEnableAllCallingModulesSync(livePP);
|
|
+ lpp::lppInstallExceptionHandler(livePP);
|
|
+#undef _MKSTR_L
|
|
+#undef _STR_L
|
|
+#endif
|
|
+
|
|
OS_Windows os(NULL);
|
|
|
|
setlocale(LC_CTYPE, "");
|
|
@@ -180,6 +195,11 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
|
|
}
|
|
delete[] argv_utf8;
|
|
|
|
+#ifdef LIVEPP_PATH
|
|
+ lpp::lppShutdown(livePP);
|
|
+ ::FreeLibrary(livePP);
|
|
+#endif
|
|
+
|
|
return os.get_exit_code();
|
|
};
|
|
|
|
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
|
|
index 4977d11..6642be9 100644
|
|
--- a/platform/windows/os_windows.cpp
|
|
+++ b/platform/windows/os_windows.cpp
|
|
@@ -53,6 +53,11 @@
|
|
#include <regstr.h>
|
|
#include <shlobj.h>
|
|
|
|
+#ifdef LIVEPP_PATH
|
|
+#include "API/LPP_API.h"
|
|
+extern HMODULE livePP;
|
|
+#endif
|
|
+
|
|
static const WORD MAX_CONSOLE_LINES = 1500;
|
|
|
|
extern "C" {
|
|
@@ -3542,6 +3547,9 @@ void OS_Windows::run() {
|
|
process_events(); // get rid of pending events
|
|
if (Main::iteration())
|
|
break;
|
|
+#ifdef LIVEPP_PATH
|
|
+ lpp::lppSyncPoint(livePP);
|
|
+#endif
|
|
};
|
|
|
|
main_loop->finish();
|