[applib,studio/applib] Move app ID to runtime variable in olympic namespace
Build / build (push) Successful in 1m33s

This commit is contained in:
2026-05-25 15:04:42 -05:00
parent 6e4c8a686f
commit 7b93a35087
3 changed files with 8 additions and 3 deletions
+2 -1
View File
@@ -42,7 +42,8 @@
#endif #endif
namespace olympic { namespace olympic {
ox::String appVersion{OLYMPIC_APP_VERSION}; ox::StringLiteral appVersion{OLYMPIC_APP_VERSION};
ox::StringLiteral appId{OLYMPIC_APP_ID};
} }
ox::Error run( ox::Error run(
+5 -1
View File
@@ -20,6 +20,10 @@
#include "font.hpp" #include "font.hpp"
#include "studioui.hpp" #include "studioui.hpp"
namespace olympic {
extern ox::StringLiteral appId;
}
namespace studio { namespace studio {
static ox::Error convertStudioConfigV1ToStudioConfigV2( static ox::Error convertStudioConfigV1ToStudioConfigV2(
@@ -94,7 +98,7 @@ static ox::Error runStudio(
ox::UPtr<ox::FileSystem> &&fs) noexcept { ox::UPtr<ox::FileSystem> &&fs) noexcept {
OX_REQUIRE_M( OX_REQUIRE_M(
ctx, ctx,
turbine::init(std::move(fs), appName, "net.drinkingtea.nostalgia.NostalgiaStudio")); turbine::init(std::move(fs), appName, olympic::appId));
oxLogError(turbine::setWindowIcon(*ctx, WindowIcons())); oxLogError(turbine::setWindowIcon(*ctx, WindowIcons()));
turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName); turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
turbine::setKeyEventHandler(*ctx, keyEventHandler); turbine::setKeyEventHandler(*ctx, keyEventHandler);
@@ -8,7 +8,7 @@
#include "about.hpp" #include "about.hpp"
namespace olympic { namespace olympic {
extern ox::String appVersion; extern ox::StringLiteral appVersion;
} }
namespace studio { namespace studio {