libretro-mirrors / ppsspp

A PSP emulator for Android, Windows, Mac and Linux, written in C++. Want to contribute? Join us in #ppsspp on freenode (IRC) or just send pull requests / issues. For discussion use the forums on ppsspp.org.
https://www.ppsspp.org
Other
12 stars 3 forks source link

Merge upstream changes. #36

Closed orbea closed 6 years ago

orbea commented 6 years ago

See the last three commits for libretro specific changes. Instead of dealing with submodules we really should just use the same commits as upstream. This additionally fixes linux x86 builds because of a wrong ffmpeg commit.

Also see the earlier version of this PR, I redid it instead of rebasing because that turned out to be easier. https://github.com/libretro/ppsspp/pull/35

orbea commented 6 years ago

This merge also contains an upstream fix for issue https://github.com/libretro/ppsspp/issues/32.