Squashed 'deps/nostalgia/' changes from 26fe266b..0de428a2
0de428a2 [studio/applib] Cleanup 8a52df4f [nostalgia/gfx] More cleanup efec6eb3 [nostalgia/gfx/studio/palette] Add RGB key shortcuts for focusing color channels 56eeb249 [nostalgia/gfx/opengl] More cleanup ae81f6b3 [ox/std] Make Span::operator[] const c1108301 [nostalgia/gfx] Cleanup 83fbe6ac [keel,turbine,studio] Fix some install mistakes 80b45283 [nostalgia/gfx] Cleanup 0fa39433 [nostalgia] Add release note about Mac menubar using Cmd cae75350 [nostalgia] Fix typos in release notes df878323 [studio] Add build date to About d585794c [nostalgia/gfx/studio/tilesheet] Fix Insert tile command 20965854 [nostalgia/gfx/studio/tilesheet] Cleanup 02383a4a [ox/std] Cleanup 185a7628 [nostalgia] Make pkg-dmg delete bundle after archive created b722b4f7 [nostalgia] Update release notes 459ab5aa [studio] Remove ability to re-order Editor tabs 565f621c [nostalgia/gfx/studio/tilesheet] Fix Delete Tile functionality 9589ca91 [keel] Cleanup 164db500 [keel] Cleanup cbfb167d [nostalgia] Remove unused project directory e7b83be8 [nostalgia] Update release notes 649da5fc [nostalgia/sample_project] Delete Scenes directory aa095f76 [studio] Make Delete key initiate deletion of selected directory bb99c99f [studio] Make deleting a directory close files in that directory 7f0dcdd2 [nostalgia/gfx/studio/tilesheet] Cleanup 6029ad5d [nostalgia/studio] Add command for bundling Mac app git-subtree-dir: deps/nostalgia git-subtree-split: 0de428a2e588d3360b98aa7e00c2498d5a54019b
This commit is contained in:
@@ -12,8 +12,6 @@
|
||||
|
||||
namespace keel {
|
||||
|
||||
class Context;
|
||||
|
||||
class Context {
|
||||
public:
|
||||
ox::UPtr<ox::FileSystem> rom;
|
||||
|
@@ -28,7 +28,7 @@ install(
|
||||
DIRECTORY
|
||||
../include/keel
|
||||
DESTINATION
|
||||
include/keel
|
||||
include
|
||||
)
|
||||
|
||||
install(
|
||||
@@ -60,4 +60,11 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
|
||||
OxClaw
|
||||
OxLogConn
|
||||
)
|
||||
install(
|
||||
TARGETS
|
||||
KeelPack-AppLib
|
||||
DESTINATION
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
)
|
||||
endif()
|
||||
|
@@ -182,7 +182,7 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
|
||||
#endif
|
||||
}
|
||||
|
||||
ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
|
||||
ox::Error reloadAsset(Context &ctx, ox::StringViewCR assetId) noexcept {
|
||||
if (beginsWith(assetId, "uuid://")) {
|
||||
return ctx.assetManager.reloadAsset(substr(assetId, 7));
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user