afegida versió controlada, no automatica
This commit is contained in:
6
Makefile
6
Makefile
@@ -26,12 +26,12 @@ DIR_PACK_TOOL := $(DIR_TOOLS)pack_resources
|
||||
SHADER_SCRIPT := $(DIR_ROOT)tools/shaders/compile_spirv.sh
|
||||
|
||||
# ==============================================================================
|
||||
# VERSION (fecha actual)
|
||||
# VERSION (extraída de defines.hpp)
|
||||
# ==============================================================================
|
||||
ifeq ($(OS),Windows_NT)
|
||||
VERSION := $(shell powershell -Command "Get-Date -Format 'yyyy-MM-dd'")
|
||||
VERSION := $(shell powershell -Command "(Select-String -Path 'source/utils/defines.hpp' -Pattern 'constexpr const char\* VERSION = \"(.+?)\"').Matches.Groups[1].Value")
|
||||
else
|
||||
VERSION := $(shell date +%Y-%m-%d)
|
||||
VERSION := $(shell grep 'constexpr const char\* VERSION' source/utils/defines.hpp | sed -E 's/.*VERSION = "([^"]+)".*/\1/')
|
||||
endif
|
||||
|
||||
# ==============================================================================
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "core/resources/resource_helper.hpp" // Para loadFile
|
||||
#include "game/options.hpp" // Para Options::loading
|
||||
#include "utils/color.hpp" // Para Color, NO_COLOR_MOD
|
||||
#include "utils/defines.hpp" // Para Texts::VERSION
|
||||
#include "utils/param.hpp" // Para Param, param, ParamPlayer, ParamResource, ParamGame
|
||||
#include "utils/utils.hpp" // Para getFileName
|
||||
#include "version.h" // Para APP_NAME, GIT_HASH
|
||||
@@ -793,12 +794,12 @@ void Resource::renderProgress() {
|
||||
1,
|
||||
text_color);
|
||||
|
||||
// Muestra la versión
|
||||
// Muestra la versión y el hash del commit
|
||||
loading_text_->writeDX(
|
||||
Text::CENTER | Text::COLOR,
|
||||
param.game.game_area.center_x,
|
||||
param.game.game_area.center_y + TEXT_HEIGHT,
|
||||
"(" + std::string(Version::GIT_HASH) + ")",
|
||||
"ver. " + std::string(Texts::VERSION) + " (" + std::string(Version::GIT_HASH) + ")",
|
||||
1,
|
||||
text_color);
|
||||
|
||||
|
||||
5
source/utils/defines.hpp
Normal file
5
source/utils/defines.hpp
Normal file
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
namespace Texts {
|
||||
constexpr const char* VERSION = "2026-04-14"; // Versión del juego (también usada por el Makefile)
|
||||
} // namespace Texts
|
||||
Reference in New Issue
Block a user