search

notaz / picodrive

Fast MegaDrive/MegaCD/32X emulator
Other
294 stars 168 forks source link

(Win32 Mingw) Adds Mingw support for libretro target #4

Closed inactive123 closed 11 years ago

inactive123 commented 11 years ago

It should compile and link now with Mingw as the compiler - the core works on Win32 machines - both x86 and x86_64. 32X, SVP and Megadrive have all been tested.

I will probably do MSVC next for Xbox 1 compatibility as well.

notaz commented 11 years ago

Quite a strange pull request, lots of my own commits in it and even github itself says "We can’t automatically merge this pull request.". I guess I'll just cherry-pick libretro related commits later.

inactive123 commented 11 years ago

Yeah I dunno what is up with the new way pull requests are handled really. Sorry about that.

notaz commented 11 years ago

Cherry-picked but our trees are still somehow out-of-sync and conflict.

If you could pull from for-libretro branch from this git the trees should no longer conflict at least.

notaz commented 11 years ago

Hmm I just remembered you once said you sometimes use "git pull --rebase", so it must be the reason for this weird pull requesst, as rebase changes all commit hashes.

So please don't use --rebase unless it's necessary, it makes reverse merges like this one difficult..

inactive123 commented 11 years ago

These kinds of conflicts could be avoided on both sides if we both used git pull --rebase instead of git pull - since these issues usually happen when there are a lot of "merge" commits.

I'll try rebasing it against your branch now.