Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mgba to 59ebf1c12dcbbe0141000cddccf667cd42e386a1 #11626

Merged

Conversation

CasualPokePlayer
Copy link
Contributor

A prerequisite for #11611

@AdmiralCurtiss
Copy link
Contributor

You sure you don't want to update to current master? Or at the very least to mgba-emu/mgba@5f3ee83?

@CasualPokePlayer
Copy link
Contributor Author

CasualPokePlayer commented Mar 5, 2023

I can go update it to the latest master (this was the latest master at the time I originally did this update in the other PR, a look at later commits shows no changes to cmake scripts mGBA side so the project files shouldn't need another update)

EDIT: This is turning out more complicated as something is severely wrong with the submodule commit history, dunno if that's my fault here locally or something that was always wrong?

@AdmiralCurtiss
Copy link
Contributor

Uh, maybe because it's checked out shallow by default? Maybe try something like

git submodule deinit Externals/mGBA/mgba
git submodule update --init --recursive --no-recommend-shallow Externals/mGBA/mgba
cd Externals/mGBA/mgba
git pull

@CasualPokePlayer
Copy link
Contributor Author

CasualPokePlayer commented Mar 5, 2023

Still seems screwy, I think it's something fubared locally on my side, it seems fine if I do it from a fresh dolphin repo clone.

@AdmiralCurtiss AdmiralCurtiss changed the title Update mgba to 9b2ba64bc68241da199ca9427b99d1f1547d9305 Update mgba to 59ebf1c12dcbbe0141000cddccf667cd42e386a1 Mar 5, 2023
@AdmiralCurtiss AdmiralCurtiss merged commit 560a239 into dolphin-emu:master Mar 5, 2023
@CasualPokePlayer CasualPokePlayer deleted the mgba_update_clang-cl branch March 5, 2023 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants