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.

Sign up for GitHub

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

Jump to bottom

Merge with upstream #43

Closed
wants to merge 158 commits into from
Closed

Merge with upstream #43

wants to merge 158 commits into from

Conversation

inactive123
Copy link
Contributor

Hi there notaz,

apologies if this pull request is a bit messy, maybe you can come up with a better way to merge the two repos.

inactive123 and others added 30 commits October 31, 2013 16:10
@inactive123
(Android JNI) Compile only armeabi-v7a binary for now
901e74f
@inactive123
(iOS) Add min SDK version flags
a559cfa
@notaz @inactive123
try to deal with some famec compiler issues
0b45bd3
@inactive123
(Clang) Linker fix
ac9abd0
@inactive123
(Android JNI) Have MIPS and x86 versions as well
d543646
@inactive123
(libretro) Go through new logger interface
f5d4045
@inactive123
Update libretro.h
033a505
@inactive123
(Libretro) Fixup logging
c681e48
@inactive123
(OSX) Set min OS version to 10.6
fd90b67
@inactive123
(PSP) Add PSP target
f18d0e0
@inactive123
(PSP/PS3) Resolve namespace conflict with memcpy16 for PS3 -
bee555a 
Fix remaining PSP build problems
@inactive123
(PS3) Define FAMEC_NO_GOTOS for PS3 - runs out of memory with GCC for
0877c7d 
Famec otherwise
@inactive123
(PS3) We shouldn't compile in zlib code in a core period -
7eaf128 
compile out zlib parts with NO_ZLIB ifdef for PSP and PS3
@inactive123
(MSVC) Add skeleton MSVC 2010 solution
5345c2b
@inactive123
C89 MSVC doesn't support 'inline' - will have to make define for
4835077 
INLINE that can be redefined by MSVC
@inactive123
(MSVC) Compatibility fixes
ed06ffd
@inactive123
Uniquely name files for MSVC
3124638
@inactive123
(MSVC) Update MSVC solution
18d52d1
@inactive123
(MSVC) Build fixes
6732b5a
@inactive123
(MSVC) Rename pico/pico/pico.c and pico/pico/memory.c
59da664
@inactive123
(MSVC) Build fixes
5e2c5b9
@inactive123
(MSVC 2010) Make use of module definition file
e8b82e7
@inactive123
Build fix
d053448
@inactive123
(OSX PPC) Improve upon some build rules
5cd9726
@inactive123
Clang fix build
2a7cbfd
@inactive123
Add -DFAMEC_NO_GOTOS for OSX PPC GCC build
5a13b15
@inactive123
Cleaner build fix for pedantic LLVM Clang issue -
34964a8 
http://stackoverflow.com/questions/12844729/linking-error-for-inline-functions
@inactive123
Add OSX version minor detection to Makefile
05689b3
@inactive123
Add performance level
2f832b7
fix libretro-super build
f3652f8
inactive123 and others added 28 commits March 26, 2017 05:30
@inactive123
Merge pull request #53 from ilag11111/cheatSupport
f5de3ba 
Restore support for short GG cheats.
@leiradel
Return correct memory info for SMS
11077d3
@inactive123
Merge pull request #54 from leiradel/master
cbc93b6 
Return correct memory info for SMS
@notaz @inactive123
fix a name clash with newer zlib
925254c
@notaz @inactive123
fix android build
75bf038
@inactive123
Update submodules
c367ebb
@inactive123
Update jni/Android.mk
c13c91c
@notaz @inactive123
remove some dead code
d3bbc8d
@notaz @inactive123
eliminate texrels (wip)
d01fa20
@notaz @inactive123
eliminate texrels (wip2)
4981de9
@notaz @inactive123
some fps counter cosmetics
36f37d2
@notaz @inactive123
configure: allow to override SDL_CONFIG
cbf31d2
@notaz @inactive123
eliminate texrels, part 3
7b4813f
@notaz @inactive123
remove dead code
06d30e6
@notaz @inactive123
get some gp2x stuff out of the way for others
006e9ad
@notaz @inactive123
android: solve "text segment is not shareable"
a765263 
Some asm is disabled and some performance is lost by this.
@notaz @inactive123
drz80: drop fast_sp for compatibility
49c8aa7 
no measurable improvement in most cases anyway
@notaz @inactive123
sh2: handle some branch exceptions
76f3e30
@notaz @inactive123
fix some warnings
8baf63e 
warning: array subscript is above array bounds [-Warray-bounds]
@notaz @inactive123
fix broken error path
3d5e32f
@notaz @inactive123
use system's zlib
653f0b1 
except for libretro
github issue #45
@notaz @inactive123
get rid of the silly unzip_stream
e4a2d86 
... and just use zlib's inflate. Needed for the next commit.
@inactive123
Update jni/Android.mk
571f7fa
@inactive123
Should hopefully fix PSP
ebf9236
@inactive123
Attempt two to fix PSP
eac2357
@inactive123
Add this to pico.h
40cd7bc
@psyke83
libretro: fix unexpected reloc type 0x03 error on Raspberry Pi 3
c7d7ac7 
Issue is caused by commit 66dda842eae01f47f5389b931ec9567fb0bbb6a1 in
cpu/cyclone submodule.
@inactive123
Merge pull request #58 from psyke83/master
9ae88ef 
libretro: fix unexpected reloc type 0x03 error on Raspberry Pi 3
@notaz
Copy link
Owner

notaz commented Oct 14, 2017

I've prepared an alternative to this:
libretro#59

@notaz notaz closed this Oct 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.