From 0f8f15fa5306cb7e629273f8d3eea276a00ae371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Tue, 13 Jan 2026 00:05:20 -0300 Subject: [PATCH] Pump ecode and eepp versions. Fix sharedir option in premake files. Minor logic fix in copy file buffer. --- include/eepp/version.hpp | 2 +- premake4.lua | 2 +- premake5.lua | 10 +++++----- src/tools/ecode/ecode.cpp | 2 +- src/tools/ecode/version.hpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/eepp/version.hpp b/include/eepp/version.hpp index 78333f56c..9f75a4156 100644 --- a/include/eepp/version.hpp +++ b/include/eepp/version.hpp @@ -6,7 +6,7 @@ #define EEPP_MAJOR_VERSION 2 #define EEPP_MINOR_VERSION 9 -#define EEPP_PATCH_LEVEL 1 +#define EEPP_PATCH_LEVEL 2 #define EEPP_CODENAME "Sādhanā" /** The compiled version of the library */ diff --git a/premake4.lua b/premake4.lua index 2b63d5e44..50843195f 100644 --- a/premake4.lua +++ b/premake4.lua @@ -597,7 +597,7 @@ function build_link_configuration( package_name, use_ee_icon ) end if _OPTIONS["sharedir"] then - defines { "ECODE_SHAREDIR='\"" .. _OPTIONS["sharedir"] .. "\"'" } + defines { 'ECODE_SHAREDIR="' .. _OPTIONS["sharedir"] .. '"' } end set_ios_config() diff --git a/premake5.lua b/premake5.lua index 83d515bcf..03d4578f6 100644 --- a/premake5.lua +++ b/premake5.lua @@ -29,7 +29,7 @@ newoption { newoption { trigger = "sharedir", value = "PATH", - description = "Set the shared data directory (default: /usr/share/ecode)", + description = "Set the shared data directory", } newoption { trigger = "with-static-cpp", description = "Builds statically libstdc++" } @@ -394,6 +394,10 @@ function build_link_configuration( package_name, use_ee_icon ) linkoptions { "-static-libgcc -static-libstdc++" } end + if _OPTIONS["sharedir"] then + defines { 'ECODE_SHAREDIR="' .. _OPTIONS["sharedir"] .. '"' } + end + cppdialect "C++20" set_ios_config() set_apple_config() @@ -491,10 +495,6 @@ function build_link_configuration( package_name, use_ee_icon ) filter { "action:export-compile-commands", "system:macosx" } buildoptions { "-std=c++20" } - filter { "options:sharedir" } - if _OPTIONS["sharedir"] then - defines { "ECODE_SHAREDIR='\"" .. _OPTIONS["sharedir"] .. "\"'" } - end filter {} end diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 68089d780..12f4c6bb5 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -2842,7 +2842,7 @@ void App::onCodeEditorCreated( UICodeEditor* editor, TextDocument& doc ) { : mSplitter->tabWidgetFromWidget( editor ) ); if ( d.first == nullptr && d.second == nullptr && !mSplitter->getTabWidgets().empty() ) d = mSplitter->createCodeEditorInTabWidget( mSplitter->getTabWidgets()[0] ); - if ( d.first != nullptr || d.second != nullptr ) { + if ( d.first != nullptr && d.second != nullptr ) { d.first->getTabWidget()->setTabSelected( d.first ); d.second->getDocument().textInput( editor->getDocument().getText() ); d.second->getDocument().setSyntaxDefinition( diff --git a/src/tools/ecode/version.hpp b/src/tools/ecode/version.hpp index 521c44370..500ca8d33 100644 --- a/src/tools/ecode/version.hpp +++ b/src/tools/ecode/version.hpp @@ -8,7 +8,7 @@ using namespace EE; #define ECODE_MAJOR_VERSION 0 #define ECODE_MINOR_VERSION 7 -#define ECODE_PATCH_LEVEL 4 +#define ECODE_PATCH_LEVEL 5 /* ECODE_COMMIT_NUMBER 9999 is used for official releases, nightly builds (pre-releases) will * contain the number of commits after the last official release */