Rebase to 0ccd3c84d from upstream #304
Conversation
Gone but not forgotten.
This is maintained downstream and not synchronized back upstream
c80c0da to
5f6747b
Compare
src/util/vfs/vfs-fd.c
Outdated
| @@ -17,6 +17,7 @@ | |||
| #endif | |||
|
|
|||
| #include <mgba-util/vector.h> | |||
| #include <mgba-util/vfs.h> | |||
There was a problem hiding this comment.
This file is already included on line 6
There was a problem hiding this comment.
Yep, thanks, this was left over from when I was working through a compilation error after the ENABLE_VFS changes. I've updated the PR with it removed, and the pipeline of course still passes, https://git.libretro.com/libretro/mgba/-/pipelines/326672.
5f6747b to
43243c1
Compare
When taking a look at the diff between mgba-emu/mgba and libretro/mgba, excluding the new files and changes to libretro.c, most of the changes are pretty small and look to me like they shouldn't be controversial. I can put together a quick PR against mgba-emu/mgba that tries to bring them a little closer together if you'd like.
Thanks for the review! |
|
Thanks for this! When I did this in July, I ran into a crash when threaded video was enabled which I bisected to 1ca7544 but I never had the time to look further into. I assume it was likely fixed with your android fix in 72b5a9d. Here were some changes upstream or downstream made that I had spotted back then if anyone wants to try to reduce the difference from upstream:
|
Tested on macOS and iOS so far. I've confirmed that rumble is fixed (fixes #303).
Only marked as a Draft PR for now because I want to run it through the gitlab builders for all of the platforms before actually having this merged, and the gitlab install is currently down.