From a22489fd58d77d1418f7f0f6cd718b1acd6c3670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sat, 5 Sep 2026 11:33:02 -0300 Subject: [PATCH] Fix Android build. --- src/eepp/graphics/renderer/renderer.cpp | 15 +++++++++++++++ src/eepp/system/ipc.cpp | 3 ++- .../plugins/aiassistant/aiassistantplugin.hpp | 4 ++-- .../plugins/autocomplete/autocompleteplugin.hpp | 4 ++-- .../ecode/plugins/debugger/debuggerplugin.hpp | 4 ++-- .../ecode/plugins/discordRPC/discordRPCplugin.hpp | 4 ++-- src/tools/ecode/plugins/git/gitplugin.hpp | 4 ++-- .../plugins/spellchecker/spellcheckerplugin.hpp | 4 ++-- .../ecode/plugins/xmltools/xmltoolsplugin.hpp | 4 ++-- 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/eepp/graphics/renderer/renderer.cpp b/src/eepp/graphics/renderer/renderer.cpp index 203ef4004..7bea0aaac 100644 --- a/src/eepp/graphics/renderer/renderer.cpp +++ b/src/eepp/graphics/renderer/renderer.cpp @@ -7,6 +7,21 @@ #include #include +#ifdef EE_GLES1_LATE_INCLUDE +#if EE_PLATFORM == EE_PLATFORM_IOS +#include +#include +#else +#include + +#ifndef GL_GLEXT_PROTOTYPES +#define GL_GLEXT_PROTOTYPES +#endif + +#include +#endif +#endif + namespace EE { namespace Graphics { #if defined( EE_GLEW_AVAILABLE ) || defined( EE_GLES2 ) diff --git a/src/eepp/system/ipc.cpp b/src/eepp/system/ipc.cpp index 99312fe4f..ffec780fb 100644 --- a/src/eepp/system/ipc.cpp +++ b/src/eepp/system/ipc.cpp @@ -35,7 +35,6 @@ constexpr Uint16 IPCVersion = 1; constexpr Uint16 IPCFlags = 0; constexpr std::size_t IPCHeaderSize = 12; constexpr std::size_t IPCInlinePayloadSize = 512; -constexpr Uint32 IPCPipeBufferSize = 64 * 1024; using EndpointHash = std::array; using NativeName = std::array; @@ -126,6 +125,8 @@ class IPC::Impl { namespace { +constexpr Uint32 IPCPipeBufferSize = 64 * 1024; + NativeName nativeName( std::wstring_view prefix, const EndpointHash& hash ) { NativeName name{}; if ( prefix.size() + hash.size() > name.size() ) diff --git a/src/tools/ecode/plugins/aiassistant/aiassistantplugin.hpp b/src/tools/ecode/plugins/aiassistant/aiassistantplugin.hpp index daeac445e..a66d2df2f 100644 --- a/src/tools/ecode/plugins/aiassistant/aiassistantplugin.hpp +++ b/src/tools/ecode/plugins/aiassistant/aiassistantplugin.hpp @@ -40,9 +40,9 @@ class AIAssistantPlugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; const LLMProviders& getProviders() { return mProviders; } diff --git a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp index 12cb47cc3..b0abaf69e 100644 --- a/src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp +++ b/src/tools/ecode/plugins/autocomplete/autocompleteplugin.hpp @@ -95,9 +95,9 @@ class AutoCompletePlugin : public Plugin { bool isReady() const override { return true; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; void onRegister( UICodeEditor* ) override; diff --git a/src/tools/ecode/plugins/debugger/debuggerplugin.hpp b/src/tools/ecode/plugins/debugger/debuggerplugin.hpp index 771b2f52b..1080b19c5 100644 --- a/src/tools/ecode/plugins/debugger/debuggerplugin.hpp +++ b/src/tools/ecode/plugins/debugger/debuggerplugin.hpp @@ -68,9 +68,9 @@ class DebuggerPlugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; void onSaveState( IniFile* state ) override; diff --git a/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp b/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp index 8b0c0005a..f1e8613d5 100644 --- a/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp +++ b/src/tools/ecode/plugins/discordRPC/discordRPCplugin.hpp @@ -43,9 +43,9 @@ class DiscordRPCplugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; protected: DiscordIPC mIPC; diff --git a/src/tools/ecode/plugins/git/gitplugin.hpp b/src/tools/ecode/plugins/git/gitplugin.hpp index 98b327358..dda3cf11e 100644 --- a/src/tools/ecode/plugins/git/gitplugin.hpp +++ b/src/tools/ecode/plugins/git/gitplugin.hpp @@ -83,9 +83,9 @@ class GitPlugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; void onSaveState( IniFile* state ) override; diff --git a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp index 0e414422a..75912dea5 100644 --- a/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp +++ b/src/tools/ecode/plugins/spellchecker/spellcheckerplugin.hpp @@ -39,9 +39,9 @@ class SpellCheckerPlugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; void drawAfterLineText( UICodeEditor* editor, const Int64& index, Vector2f position, const Float& fontSize, const Float& lineHeight ) override; diff --git a/src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp b/src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp index 3633abb92..0f951963b 100644 --- a/src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp +++ b/src/tools/ecode/plugins/xmltools/xmltoolsplugin.hpp @@ -36,9 +36,9 @@ class XMLToolsPlugin : public PluginBase { std::string getDescription() override { return Definition().description; } - bool hasSettingsPage() const { return true; } + bool hasSettingsPage() const override { return true; } - void registerSettings( SettingsPage& page ); + void registerSettings( SettingsPage& page ) override; bool getHighlightMatch() const;