Closed javierdlr closed 1 year ago
Ooops forget it just found I did pull to wrong branch :-( Think I changed to the correct branch (amigaos4)
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.
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?
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.
updated amigaos4 SDLPoP with latest main v1.23 changes.