Compare commits
2 Commits
7233da75ea
...
release-d2
| Author | SHA1 | Date | |
|---|---|---|---|
| 889fe04255 | |||
| eed115b287 |
@@ -11,7 +11,7 @@ target_link_libraries(
|
|||||||
|
|
||||||
target_compile_definitions(
|
target_compile_definitions(
|
||||||
NostalgiaStudio PUBLIC
|
NostalgiaStudio PUBLIC
|
||||||
OLYMPIC_APP_VERSION="dev build"
|
OLYMPIC_APP_VERSION="d2024.05.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ ox::Error preloadObj(
|
|||||||
oxOutf("preloading {} as a {}\n", path, obj.type()->typeName);
|
oxOutf("preloading {} as a {}\n", path, obj.type()->typeName);
|
||||||
// preload
|
// preload
|
||||||
oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj)));
|
oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj)));
|
||||||
auto const err = ox::preload<GbaPlatSpec, decltype(obj)>(&pl, &obj);
|
auto const err = ox::preload<GbaPlatSpec, ox::ModelObject>(&pl, &obj);
|
||||||
oxReturnError(pl.endAlloc());
|
oxReturnError(pl.endAlloc());
|
||||||
oxReturnError(err);
|
oxReturnError(err);
|
||||||
keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)};
|
keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)};
|
||||||
|
|||||||
Reference in New Issue
Block a user