search

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

Update core. #19

Closed orbea closed 7 years ago

orbea commented 7 years ago

This attempts to merge the upstream ppsspp changes into the libretro core. The few merge conflicts were fixed with entirely upstream code. I also encountered these problems which I attempted to fix in the last three commits.

  1. bSeparateCPUThread was removed upstream.
  2. I updated Makefile.common to fix undefined references.
  3. After upstream commit https://github.com/hrydgard/ppsspp/commit/017d3da067f526360820c52a10fb1bde87d7ab5a the core started to segfault when content was closed.

Note that I have only tested this on Linux.

orbea commented 7 years ago

Ugh, seems the buildbot is using cmake for some retarded reason and I didn't bother to test that, only the static Makefile. If I really have to I can look into that tomorrow...

orbea commented 7 years ago

Actually I think its because cmake is using glew.c instead of glew_libretro.c. I'll have to see how to tell cmake to do that tomorrow, if someone who actually likes cmake would like to help here it'd be very much appreciated.

It can also be worked around if glew is installed on the build OS, but that may not be portable for a buildbot?

inactive123 commented 7 years ago

It should really be using glew_libretro instead.

orbea commented 7 years ago

I pushed another commit to use glew_libretro.c. I'm not sure about how to force it instead of a natively installed glew, but I think this should make the buildbot happy.

orbea commented 7 years ago

Unfortunately that didn't seem to help the cmake build issues even if it works locally?

I pushed another commit to hopefully fix the android build issues, but I would need the buildbot to test it...

orbea commented 7 years ago

I'm not sure why travis insists on using glew.c insted of glew_libretro.c with cmake. It works here?!

Also for android this is the current issue.

jni/../../Common/Vulkan/VulkanContext.cpp:917:2: error: use of undeclared identifier 'init_resources'

 init_resources(Resources);

 ^

Any ideas?

orbea commented 7 years ago

Seems travis is now happy with android even though I didn't change anything....

inactive123 commented 7 years ago

Let's merge it and then we can go from there.