From 7b93a3508715922539674431626f574f4fd54c82 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 25 May 2026 15:04:42 -0500 Subject: [PATCH] [applib,studio/applib] Move app ID to runtime variable in olympic namespace --- deps/nostalgia/src/olympic/applib/applib.cpp | 3 ++- deps/nostalgia/src/olympic/studio/applib/src/app.cpp | 6 +++++- .../src/olympic/studio/applib/src/popups/about.cpp | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deps/nostalgia/src/olympic/applib/applib.cpp b/deps/nostalgia/src/olympic/applib/applib.cpp index ba09918..c0bfaf3 100644 --- a/deps/nostalgia/src/olympic/applib/applib.cpp +++ b/deps/nostalgia/src/olympic/applib/applib.cpp @@ -42,7 +42,8 @@ #endif namespace olympic { -ox::String appVersion{OLYMPIC_APP_VERSION}; +ox::StringLiteral appVersion{OLYMPIC_APP_VERSION}; +ox::StringLiteral appId{OLYMPIC_APP_ID}; } ox::Error run( diff --git a/deps/nostalgia/src/olympic/studio/applib/src/app.cpp b/deps/nostalgia/src/olympic/studio/applib/src/app.cpp index befaf11..210590a 100644 --- a/deps/nostalgia/src/olympic/studio/applib/src/app.cpp +++ b/deps/nostalgia/src/olympic/studio/applib/src/app.cpp @@ -20,6 +20,10 @@ #include "font.hpp" #include "studioui.hpp" +namespace olympic { +extern ox::StringLiteral appId; +} + namespace studio { static ox::Error convertStudioConfigV1ToStudioConfigV2( @@ -94,7 +98,7 @@ static ox::Error runStudio( ox::UPtr &&fs) noexcept { OX_REQUIRE_M( ctx, - turbine::init(std::move(fs), appName, "net.drinkingtea.nostalgia.NostalgiaStudio")); + turbine::init(std::move(fs), appName, olympic::appId)); oxLogError(turbine::setWindowIcon(*ctx, WindowIcons())); turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName); turbine::setKeyEventHandler(*ctx, keyEventHandler); diff --git a/deps/nostalgia/src/olympic/studio/applib/src/popups/about.cpp b/deps/nostalgia/src/olympic/studio/applib/src/popups/about.cpp index cc3d946..3df8cd6 100644 --- a/deps/nostalgia/src/olympic/studio/applib/src/popups/about.cpp +++ b/deps/nostalgia/src/olympic/studio/applib/src/popups/about.cpp @@ -8,7 +8,7 @@ #include "about.hpp" namespace olympic { -extern ox::String appVersion; +extern ox::StringLiteral appVersion; } namespace studio {