search

NagyD / SDLPoP

An open-source port of Prince of Persia, based on the disassembly of the DOS version.
GNU General Public License v3.0
1.1k stars 140 forks source link

Update to v1.23 #300

Closed javierdlr closed 1 year ago

javierdlr commented 1 year ago

updated amigaos4 SDLPoP with latest main v1.23 changes.

javierdlr commented 1 year ago

Ooops forget it just found I did pull to wrong branch :-( Think I changed to the correct branch (amigaos4)

NagyD commented 1 year ago

This gave me loads of merge conflicts. I went through them all by hand to ensure all merges are done right, and still I got some compiler errors after I committed the merge.

In the long term it would be better if I could merge amigaos4 into master, and the same source could be compiled for all systems.

NagyD commented 1 year ago

Okay, I have merged amigaos4 into master. I have verified that it compiles and runs correctly on Windows. Could you verify the same on AmigaOS?

javierdlr commented 1 year ago

1st sorry for answering so late. 2nd sorry for all the hassle while merging amigaos4<->master

Downloaded and build/mAKE amigaos4 works, but I have to add some defines in makefile.amigaos4, will send it ASAP.