mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-20 17:26:01 +08:00
[godot] Backport Godot 4.5 compatibility fixes from 4.3-beta
Backported three commits from 4.3-beta branch: - cc12304ba: Adds TOOLS_ENABLED guards for editor includes - e063bae54: Adds version macro compatibility for deprecated=no builds (module) - 3ffea502e: Adds version macro compatibility for deprecated=no builds (extension) Changes: 1. SpineCommon.h: - Added #include "core/version_generated.gen.h" - Added VERSION_MAJOR/MINOR/PATCH macro fallbacks for both module and extension builds - These macros are needed when building with deprecated=no in Godot 4.5+ 2. SpineSkeletonDataResource.cpp and SpineSprite.cpp: - Wrapped editor_interface.h includes with TOOLS_ENABLED guards - Required for building export templates (non-editor builds) in Godot 4.5+ This ensures spine-godot compiles correctly with Godot 4.5 in all build configurations.
This commit is contained in:
parent
a6c9cc2225
commit
938c72fa8f
@ -30,8 +30,18 @@
|
|||||||
#ifndef SPINE_COMMON_H
|
#ifndef SPINE_COMMON_H
|
||||||
#define SPINE_COMMON_H
|
#define SPINE_COMMON_H
|
||||||
|
|
||||||
|
#include "core/version_generated.gen.h"
|
||||||
#ifdef SPINE_GODOT_EXTENSION
|
#ifdef SPINE_GODOT_EXTENSION
|
||||||
#include <godot_cpp/core/version.hpp>
|
#include <godot_cpp/core/version.hpp>
|
||||||
|
|
||||||
|
// When running scons with deprecated=no, these are not defined in version.h in Godot 4.5.1
|
||||||
|
// but our code for older versions of Godot relies on them.
|
||||||
|
#ifndef VERSION_MAJOR
|
||||||
|
#define VERSION_MAJOR GODOT_VERSION_MAJOR
|
||||||
|
#define VERSION_MINOR GODOT_VERSION_MINOR
|
||||||
|
#define VERSION_PATCH GODOT_VERSION_PATCH
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <godot_cpp/classes/ref_counted.hpp>
|
#include <godot_cpp/classes/ref_counted.hpp>
|
||||||
#include <godot_cpp/variant/string_name.hpp>
|
#include <godot_cpp/variant/string_name.hpp>
|
||||||
using namespace godot;
|
using namespace godot;
|
||||||
@ -46,17 +56,20 @@ using namespace godot;
|
|||||||
#define RES Ref<Resource>
|
#define RES Ref<Resource>
|
||||||
#define REF Ref<RefCounted>
|
#define REF Ref<RefCounted>
|
||||||
#define GEOMETRY2D Geometry2D
|
#define GEOMETRY2D Geometry2D
|
||||||
#ifndef VERSION_MAJOR
|
|
||||||
#define VERSION_MAJOR GODOT_VERSION_MAJOR
|
|
||||||
#endif
|
|
||||||
#ifndef VERSION_MINOR
|
|
||||||
#define VERSION_MINOR GODOT_VERSION_MINOR
|
|
||||||
#endif
|
|
||||||
// FIXME this doesn't do the same as the engine SNAME in terms of caching
|
// FIXME this doesn't do the same as the engine SNAME in terms of caching
|
||||||
#define SNAME(name) StringName(name)
|
#define SNAME(name) StringName(name)
|
||||||
#define RS RenderingServer
|
#define RS RenderingServer
|
||||||
#else
|
#else
|
||||||
#include "core/version.h"
|
#include "core/version.h"
|
||||||
|
|
||||||
|
// When running scons with deprecated=no, these are not defined in version.h in Godot 4.5.1
|
||||||
|
// but our code for older versions of Godot relies on them.
|
||||||
|
#ifndef VERSION_MAJOR
|
||||||
|
#define VERSION_MAJOR GODOT_VERSION_MAJOR
|
||||||
|
#define VERSION_MINOR GODOT_VERSION_MINOR
|
||||||
|
#define VERSION_PATCH GODOT_VERSION_PATCH
|
||||||
|
#endif
|
||||||
|
|
||||||
#if VERSION_MAJOR > 3
|
#if VERSION_MAJOR > 3
|
||||||
#include "core/core_bind.h"
|
#include "core/core_bind.h"
|
||||||
#include "core/error/error_macros.h"
|
#include "core/error/error_macros.h"
|
||||||
|
|||||||
@ -33,11 +33,15 @@
|
|||||||
#ifdef SPINE_GODOT_EXTENSION
|
#ifdef SPINE_GODOT_EXTENSION
|
||||||
#include <godot_cpp/classes/encoded_object_as_id.hpp>
|
#include <godot_cpp/classes/encoded_object_as_id.hpp>
|
||||||
#include <godot_cpp/classes/engine.hpp>
|
#include <godot_cpp/classes/engine.hpp>
|
||||||
|
#ifdef TOOLS_ENABLED
|
||||||
#include <godot_cpp/classes/editor_interface.hpp>
|
#include <godot_cpp/classes/editor_interface.hpp>
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#if VERSION_MAJOR > 3
|
#if VERSION_MAJOR > 3
|
||||||
#include "core/config/engine.h"
|
#include "core/config/engine.h"
|
||||||
|
#ifdef TOOLS_ENABLED
|
||||||
#include "editor/editor_interface.h"
|
#include "editor/editor_interface.h"
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#include "core/engine.h"
|
#include "core/engine.h"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -41,7 +41,9 @@
|
|||||||
#include <godot_cpp/variant/array.hpp>
|
#include <godot_cpp/variant/array.hpp>
|
||||||
#include <godot_cpp/classes/mesh.hpp>
|
#include <godot_cpp/classes/mesh.hpp>
|
||||||
#include <godot_cpp/classes/rendering_server.hpp>
|
#include <godot_cpp/classes/rendering_server.hpp>
|
||||||
|
#ifdef TOOLS_ENABLED
|
||||||
#include <godot_cpp/classes/editor_interface.hpp>
|
#include <godot_cpp/classes/editor_interface.hpp>
|
||||||
|
#endif
|
||||||
#include <godot_cpp/classes/control.hpp>
|
#include <godot_cpp/classes/control.hpp>
|
||||||
#include <godot_cpp/classes/viewport.hpp>
|
#include <godot_cpp/classes/viewport.hpp>
|
||||||
#include <godot_cpp/classes/scene_tree.hpp>
|
#include <godot_cpp/classes/scene_tree.hpp>
|
||||||
@ -60,7 +62,7 @@
|
|||||||
#include "scene/resources/mesh.h"
|
#include "scene/resources/mesh.h"
|
||||||
#include "servers/rendering_server.h"
|
#include "servers/rendering_server.h"
|
||||||
#include "scene/resources/canvas_item_material.h"
|
#include "scene/resources/canvas_item_material.h"
|
||||||
#if VERSION_MINOR > 0
|
#if VERSION_MINOR > 0 && defined(TOOLS_ENABLED)
|
||||||
#include "editor/editor_interface.h"
|
#include "editor/editor_interface.h"
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user