From 4e6155212621eb37a68fa482bcf1b110cc5c390c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 7 Dec 2022 00:30:22 -0300 Subject: [PATCH] Fixed release build in Windows. ecode pumped version, soon to be released. --- premake5.lua | 1 + src/eepp/core/debug.cpp | 3 ++- src/tools/ecode/ecode.cpp | 6 +++++- src/tools/ecode/version.hpp | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/premake5.lua b/premake5.lua index 09e4552ca..18cf5bf37 100644 --- a/premake5.lua +++ b/premake5.lua @@ -202,6 +202,7 @@ function build_base_cpp_configuration( package_name ) targetname ( package_name .. "-debug" ) filter "configurations:release*" + defines { "NDEBUG" } optimize "Speed" if _OPTIONS["with-debug-symbols"] then symbols "On" diff --git a/src/eepp/core/debug.cpp b/src/eepp/core/debug.cpp index dc5dba393..8e0440e13 100644 --- a/src/eepp/core/debug.cpp +++ b/src/eepp/core/debug.cpp @@ -33,7 +33,8 @@ void eeREPORT_ASSERT( const char* File, int Line, const char* Exp ) { printf( "ASSERT: %s file:%s line:%d", Exp, File, Line ); } -#if defined( EE_COMPILER_GCC ) && !defined( EE_ARM ) && EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN && EE_PLATFORM != EE_PLATFORM_ANDROID && EE_PLATFORM != EE_PLATFORM_IOS +#if defined( EE_COMPILER_GCC ) && !defined( EE_ARM ) && EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN && \ + EE_PLATFORM != EE_PLATFORM_ANDROID && EE_PLATFORM != EE_PLATFORM_IOS asm( "int3" ); #else assert( false ); diff --git a/src/tools/ecode/ecode.cpp b/src/tools/ecode/ecode.cpp index 964944db5..f5b392e8b 100644 --- a/src/tools/ecode/ecode.cpp +++ b/src/tools/ecode/ecode.cpp @@ -4074,7 +4074,8 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { args::Flag benchmarkMode( parser, "benchmark-mode", "Render as much as possible to measure the rendering performance.", { "benchmark-mode" } ); - + args::Flag verbose( parser, "verbose", "Print all logs to the standard output.", + { 'v', "verbose" } ); try { #if EE_PLATFORM != EE_PLATFORM_EMSCRIPTEN parser.ParseCLI( argc, argv ); @@ -4094,6 +4095,9 @@ EE_MAIN_FUNC int main( int argc, char* argv[] ) { return EXIT_FAILURE; } + if ( verbose.Get() ) + Log::instance()->setConsoleOutput( true ); + appInstance = eeNew( App, () ); appInstance->init( logLevel.Get(), filePos ? filePos.Get() : file.Get(), pixelDenstiyConf ? pixelDenstiyConf.Get() : 0.f, diff --git a/src/tools/ecode/version.hpp b/src/tools/ecode/version.hpp index bdd3674d4..5a87b97f6 100644 --- a/src/tools/ecode/version.hpp +++ b/src/tools/ecode/version.hpp @@ -7,9 +7,9 @@ using namespace EE; #define ECODE_MAJOR_VERSION 0 -#define ECODE_MINOR_VERSION 3 -#define ECODE_PATCH_LEVEL 1 -#define ECODE_CODENAME "Mūlādhāra" +#define ECODE_MINOR_VERSION 4 +#define ECODE_PATCH_LEVEL 0 +#define ECODE_CODENAME "Vajra" /** The compiled version of the library */ #define ECODE_VERSION( x ) \