From c1a628f0615651ee1e3046c2511f6c160461b6af Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 6 Dec 2024 23:20:30 -0600 Subject: [PATCH] [turbine] Add init wrapper that takes FS path --- .../src/olympic/turbine/include/turbine/turbine.hpp | 2 ++ .../src/olympic/turbine/src/CMakeLists.txt | 5 +++++ deps/nostalgia/src/olympic/turbine/src/turbine.cpp | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 deps/nostalgia/src/olympic/turbine/src/turbine.cpp diff --git a/deps/nostalgia/src/olympic/turbine/include/turbine/turbine.hpp b/deps/nostalgia/src/olympic/turbine/include/turbine/turbine.hpp index e27341d..aa6cfc6 100644 --- a/deps/nostalgia/src/olympic/turbine/include/turbine/turbine.hpp +++ b/deps/nostalgia/src/olympic/turbine/include/turbine/turbine.hpp @@ -18,6 +18,8 @@ using TimeMs = uint64_t; ox::Result init(ox::UPtr &&fs, ox::StringViewCR appName) noexcept; +ox::Result init(ox::StringViewCR fsPath, ox::StringViewCR appName) noexcept; + ox::Error run(Context &ctx) noexcept; // Returns the number of milliseconds that have passed since the start of the diff --git a/deps/nostalgia/src/olympic/turbine/src/CMakeLists.txt b/deps/nostalgia/src/olympic/turbine/src/CMakeLists.txt index 1e647f7..c8b08b8 100644 --- a/deps/nostalgia/src/olympic/turbine/src/CMakeLists.txt +++ b/deps/nostalgia/src/olympic/turbine/src/CMakeLists.txt @@ -18,6 +18,11 @@ target_include_directories( ../include ) +target_sources( + Turbine PUBLIC + turbine.cpp +) + target_link_libraries( Turbine PUBLIC Keel diff --git a/deps/nostalgia/src/olympic/turbine/src/turbine.cpp b/deps/nostalgia/src/olympic/turbine/src/turbine.cpp new file mode 100644 index 0000000..3c56b7c --- /dev/null +++ b/deps/nostalgia/src/olympic/turbine/src/turbine.cpp @@ -0,0 +1,13 @@ + +#include + +#include + +namespace turbine { + +ox::Result init(ox::StringViewCR fsPath, ox::StringViewCR appName) noexcept { + oxRequireM(fs, keel::loadRomFs(fsPath)); + return init(std::move(fs), appName); +} + +} \ No newline at end of file