mauiaaron
commented
8 years ago OK this is now merged (but with new SHAs, see below)! The OSX interface changes look really good, thank you! The iOS port still has problems running on my iPod touch because it uses an iPad-only API, (but I saw that before when I was working on the iOS port).
So I merged your changes from the command line (without all the merge commits and then added some other small changes to the Xcode project files; and I fixed an OpenGL crash I introduced with a recent Android commit). Unfortunately because of how I did the merge, all your commits now have new SHAs (sorry for that!). What I suggest you do: is to make a backup of your local work to a completely different folder (outside your repo), and then git reset hard to my upstream develop branch (or just do a new fork/clone of my repo), then you can copy anything I might have missed from your backup copy).
For next pull request:
- If you need to make changes to the core emulation (basically the C files), please brace your changes with
#ifdef __APPLE__as I have done in this commit : https://github.com/mauiaaron/apple2/commit/8f17f8fe4f51eb7e0ec366e6e2abc9a4437a9fa8 (This is because some of what you removed is still useful for the Android and desktop Linux ports). - Also I prefer not to see merge commits in a pull request, so please
git rebaseyour branch to my upstream develop branch before issuing a pull request. (Maybe the best way is to work in your own "feature branch" and then when you are ready to issue a pull request, you can then git rebase your feature branch against my upstream develop?)
Thank you again for your contributions, and please keep in touch! Also, nice Youtube video! =D
Kind regards,
IOS Working version MacOsX Version with OsX interface