Compare commits
No commits in common. "7f56a77e7d628f82768a0078462859f6f673bb32" and "de9f84264037854a1a6dfda1925548dd81ba7ce2" have entirely different histories.
7f56a77e7d
...
de9f842640
@ -9,11 +9,6 @@ target_link_libraries(
|
|||||||
OlympicApplib
|
OlympicApplib
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(
|
|
||||||
NostalgiaStudio PUBLIC
|
|
||||||
OLYMPIC_APP_VERSION="2023.12.0"
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
install(
|
||||||
TARGETS
|
TARGETS
|
||||||
NostalgiaStudio
|
NostalgiaStudio
|
||||||
|
@ -13,10 +13,6 @@
|
|||||||
#define OLYMPIC_APP_NAME "App"
|
#define OLYMPIC_APP_NAME "App"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef OLYMPIC_APP_VERSION
|
|
||||||
#define OLYMPIC_APP_VERSION "dev build"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef OLYMPIC_PROJECT_NAMESPACE
|
#ifndef OLYMPIC_PROJECT_NAMESPACE
|
||||||
#define OLYMPIC_PROJECT_NAMESPACE project
|
#define OLYMPIC_PROJECT_NAMESPACE project
|
||||||
#endif
|
#endif
|
||||||
@ -35,8 +31,6 @@
|
|||||||
|
|
||||||
namespace olympic {
|
namespace olympic {
|
||||||
|
|
||||||
ox::String s_version = ox::String(OLYMPIC_APP_VERSION);
|
|
||||||
|
|
||||||
ox::Error run(
|
ox::Error run(
|
||||||
ox::StringView project,
|
ox::StringView project,
|
||||||
ox::StringView appName,
|
ox::StringView appName,
|
||||||
|
@ -7,14 +7,10 @@
|
|||||||
#include <studio/imguiuitl.hpp>
|
#include <studio/imguiuitl.hpp>
|
||||||
#include "aboutpopup.hpp"
|
#include "aboutpopup.hpp"
|
||||||
|
|
||||||
namespace olympic {
|
|
||||||
extern ox::String s_version;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace studio {
|
namespace studio {
|
||||||
|
|
||||||
AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
|
AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
|
||||||
m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::s_version);
|
m_text = ox::sfmt("{} - dev build", keelCtx(ctx).appName);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AboutPopup::open() noexcept {
|
void AboutPopup::open() noexcept {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user