drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia,olympic] Move olympic::run to global namespace
All checks were successful
Build / build (push) Successful in 2m34s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-12-06 00:13:10 -06:00
parent 9a42a9b9d9
commit e0ec9e0c5f
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/player/app.cpp
View File

@ -157,8 +157,6 @@ static ox::Error runScene(turbine::Context &tctx) {
return turbine::run(tctx); return turbine::run(tctx);
} }
namespace olympic {
ox::Error run( ox::Error run(
[[maybe_unused]] ox::StringView project, [[maybe_unused]] ox::StringView project,
[[maybe_unused]] ox::StringView appName, [[maybe_unused]] ox::StringView appName,
@ -172,5 +170,3 @@ ox::Error run(
oxRequireM(tctx, turbine::init(std::move(fs), project)); oxRequireM(tctx, turbine::init(std::move(fs), project));
return runTileSheetSetTest(*tctx); return runTileSheetSetTest(*tctx);
} }
}

10
src/olympic/applib/applib.cpp
View File

@ -17,6 +17,10 @@
#define OLYMPIC_APP_VERSION "dev build" #define OLYMPIC_APP_VERSION "dev build"
#endif #endif
#ifndef OLYMPIC_GUI_APP
#define OLYMPIC_GUI_APP 0
#endif
#ifndef OLYMPIC_PROJECT_NAMESPACE #ifndef OLYMPIC_PROJECT_NAMESPACE
#define OLYMPIC_PROJECT_NAMESPACE project #define OLYMPIC_PROJECT_NAMESPACE project
#endif #endif
@ -34,8 +38,8 @@
#endif #endif
namespace olympic { namespace olympic {
ox::String appVersion = ox::String(OLYMPIC_APP_VERSION); ox::String appVersion = ox::String(OLYMPIC_APP_VERSION);
}
ox::Error run( ox::Error run(
ox::StringView project, ox::StringView project,
@ -43,8 +47,6 @@ ox::Error run(
ox::StringView projectDataDir, ox::StringView projectDataDir,
ox::SpanView<char const*> argv) noexcept; ox::SpanView<char const*> argv) noexcept;
}
namespace OLYMPIC_PROJECT_NAMESPACE { namespace OLYMPIC_PROJECT_NAMESPACE {
void registerKeelModules() noexcept; void registerKeelModules() noexcept;
void registerStudioModules() noexcept; void registerStudioModules() noexcept;
@ -64,7 +66,7 @@ int main(int argc, char const**argv) {
#if OLYMPIC_LOAD_STUDIO_MODULES #if OLYMPIC_LOAD_STUDIO_MODULES
OLYMPIC_PROJECT_NAMESPACE::registerStudioModules(); OLYMPIC_PROJECT_NAMESPACE::registerStudioModules();
#endif #endif
auto const err = olympic::run( auto const err = run(
OLYMPIC_PROJECT_NAME, OLYMPIC_PROJECT_NAME,
OLYMPIC_APP_NAME, OLYMPIC_APP_NAME,
OLYMPIC_PROJECT_DATADIR, OLYMPIC_PROJECT_DATADIR,

4
src/olympic/keel/src/pack-applib.cpp
View File

@ -97,8 +97,6 @@ static ox::Error run(ox::SpanView<char const*> argv, ox::StringView projectDataD
return pack(argSrc, argRomBin, argManifest, projectDataDir); return pack(argSrc, argRomBin, argManifest, projectDataDir);
} }
namespace olympic {
ox::Error run( ox::Error run(
[[maybe_unused]] ox::StringView project, [[maybe_unused]] ox::StringView project,
[[maybe_unused]] ox::StringView appName, [[maybe_unused]] ox::StringView appName,
@ -106,5 +104,3 @@ ox::Error run(
ox::SpanView<char const*> argv) noexcept { ox::SpanView<char const*> argv) noexcept {
return ::run(argv, projectDataDir); return ::run(argv, projectDataDir);
} }
}

4
src/olympic/studio/applib/src/main.cpp
View File

@ -67,8 +67,6 @@ static ox::Error run(
} }
namespace olympic {
ox::Error run( ox::Error run(
ox::StringView project, ox::StringView project,
ox::StringView appName, ox::StringView appName,
@ -76,5 +74,3 @@ ox::Error run(
ox::SpanView<char const*> args) noexcept { ox::SpanView<char const*> args) noexcept {
return studio::run(ox::sfmt("{} {}", project, appName), projectDataDir, args); return studio::run(ox::sfmt("{} {}", project, appName), projectDataDir, args);
} }
}