Fix build: add GODOT_VERSION compatibility macros, fix includes, disable incomplete modules

This commit is contained in:
MrPiglr 2026-03-01 00:21:43 -07:00
parent ac3dd59c42
commit 71f7b991a5
18 changed files with 37 additions and 20 deletions

View file

@ -35,7 +35,7 @@
#include "core/io/file_access.h"
#include "core/io/json.h"
#include "core/os/midi_driver.h"
#include "core/version_generated.gen.h"
#include "core/version.h"
#include <cstdarg>

View file

@ -46,7 +46,7 @@ STATIC_ASSERT_INCOMPLETE_TYPE(class, Object);
#include "core/string/translation_server.h"
#include "core/string/ucaps.h"
#include "core/variant/variant.h"
#include "core/version_generated.gen.h"
#include "core/version.h"
#include "thirdparty/grisu2/grisu2.h"

View file

@ -86,3 +86,21 @@ extern const char *const AETHEX_VERSION_HASH;
// Git commit date UNIX timestamp (in seconds), generated at build time in `core/version_hash.gen.cpp`.
// Set to 0 if unknown.
extern const uint64_t AETHEX_VERSION_TIMESTAMP;
// Backward compatibility for third-party code using Godot version macros
#define GODOT_VERSION_MAJOR AETHEX_VERSION_MAJOR
#define GODOT_VERSION_MINOR AETHEX_VERSION_MINOR
#define GODOT_VERSION_PATCH AETHEX_VERSION_PATCH
#define GODOT_VERSION_STATUS AETHEX_VERSION_STATUS
#define GODOT_VERSION_BUILD AETHEX_VERSION_BUILD
#define GODOT_VERSION_FULL_CONFIG AETHEX_VERSION_FULL_CONFIG
#define GODOT_VERSION_FULL_BUILD AETHEX_VERSION_FULL_BUILD
#define GODOT_VERSION_NUMBER AETHEX_VERSION_NUMBER
#define GODOT_VERSION_BRANCH AETHEX_VERSION_BRANCH
#define GODOT_VERSION_SHORT_NAME AETHEX_VERSION_SHORT_NAME
#define GODOT_VERSION_NAME AETHEX_VERSION_NAME
#define GODOT_VERSION_WEBSITE AETHEX_VERSION_WEBSITE
#define GODOT_VERSION_DOCS_BRANCH AETHEX_VERSION_DOCS_BRANCH
#define GODOT_VERSION_DOCS_URL AETHEX_VERSION_DOCS_URL
#define GODOT_VERSION_MODULE_CONFIG AETHEX_VERSION_MODULE_CONFIG
#define GODOT_VERSION_HEX AETHEX_VERSION_HEX

View file

@ -31,7 +31,7 @@
#include "text_shader_editor.h"
#include "core/config/project_settings.h"
#include "core/version_generated.gen.h"
#include "core/version.h"
#include "editor/editor_node.h"
#include "editor/editor_string_names.h"
#include "editor/file_system/editor_file_system.h"

View file

@ -35,7 +35,7 @@
#include "core/io/resource_loader.h"
#include "core/math/math_defs.h"
#include "core/os/keyboard.h"
#include "core/version_generated.gen.h"
#include "core/version.h"
#include "editor/docks/filesystem_dock.h"
#include "editor/docks/inspector_dock.h"
#include "editor/editor_node.h"

View file

@ -1,5 +1,5 @@
def can_build(env, platform):
return True # Re-enabled
return False # Disabled until API compatibility fixes
def configure(env):
pass

View file

@ -1,6 +1,6 @@
def can_build(env, platform):
"""AeThex Lang can be built on all platforms."""
return True # Re-enabled
return False # Disabled until API compatibility fixes
def configure(env):
pass

View file

@ -12,6 +12,7 @@
#include "core/crypto/crypto.h"
#include "core/io/zip_io.h"
#include "core/os/os.h"
#include "core/os/time.h"
void AeThexAssetDownloader::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_default_location", "location"), &AeThexAssetDownloader::set_default_location);
@ -270,9 +271,6 @@ String AeThexAssetDownloader::calculate_file_hash(const String &file_path) const
return "";
}
Ref<Crypto> crypto;
crypto.instantiate();
PackedByteArray data = fa->get_buffer(fa->get_length());
return data.hex_encode(); // Simplified - real impl would use SHA256
return String::hex_encode_buffer(data.ptr(), data.size()); // Simplified - real impl would use SHA256
}

View file

@ -1,7 +1,7 @@
# config.py - AeThex Marketplace Module
def can_build(env, platform):
return True # Re-enabled
return False # Disabled until API compatibility fixes
def configure(env):
pass

View file

@ -14,6 +14,7 @@
#include "editor/editor_node.h"
#include "editor/themes/editor_scale.h"
#include "scene/gui/separator.h"
void MarketplaceDock::_bind_methods() {
ClassDB::bind_method(D_METHOD("refresh"), &MarketplaceDock::refresh);

View file

@ -252,8 +252,7 @@ void AeThexMarketplaceClient::_on_request_completed(int p_result, int p_code, co
return;
}
String body_text;
body_text.parse_utf8((const char *)p_body.ptr(), p_body.size());
String body_text = String::utf8((const char *)p_body.ptr(), p_body.size());
JSON json;
Error err = json.parse(body_text);

View file

@ -1,5 +1,5 @@
def can_build(env, platform):
return not env["disable_physics_2d"]
return False # Disabled until implementation is complete
def configure(env):

View file

@ -1,5 +1,5 @@
def can_build(env, platform):
return not env["disable_physics_3d"]
return False # Disabled until implementation is complete
def configure(env):

View file

@ -1,5 +1,5 @@
def can_build(env, platform):
return True # Re-enabled
return False # Disabled until API compatibility fixes
def configure(env):
pass

View file

@ -162,7 +162,7 @@ private:
void _on_new_project_pressed();
public:
virtual String get_name() const override { return "AeThexTemplates"; }
virtual String get_plugin_name() const override { return "AeThexTemplates"; }
AeThexTemplatePlugin();
~AeThexTemplatePlugin();

View file

@ -37,6 +37,7 @@ private:
void _init_builtin_templates();
void _load_downloaded_templates();
void _cache_template(const Ref<AeThexTemplate> &p_template);
String _create_project_godot(const String &p_name, const Ref<AeThexTemplate> &p_template);
protected:
static void _bind_methods();

View file

@ -92,9 +92,9 @@ else:
prog = env.add_program("#bin/aethex", sources, PROGSUFFIX=env["PROGSUFFIX"])
arrange_program_clean(prog)
env.Depends(prog, "godot.manifest")
env.Depends(prog, "aethex.manifest")
if env.msvc:
env.Depends(prog, "godot.natvis")
env.Depends(prog, "aethex.natvis")
# Build console wrapper app.
if env["windows_subsystem"] == "gui":

View file

@ -40,7 +40,7 @@
#include "core/io/marshalls.h"
#include "core/os/main_loop.h"
#include "core/profiling/profiling.h"
#include "core/version_generated.gen.h"
#include "core/version.h"
#include "drivers/windows/dir_access_windows.h"
#include "drivers/windows/file_access_windows.h"
#include "drivers/windows/file_access_windows_pipe.h"