As my old WinUAE port was based on WinUAE 2.3.1 sources, which are quite dated now, I decided to first merge my tree with more up to date sources, before I start to fix/improve the port.
As the WinUAE 2.9.x is still in heavy development, I went for the last stable release 2.8.10 and merged all the files. The port of 2.3.1 was quite a lot of work, as the code failed with gcc on many places. Luckily, Toni has fixed lot of those places in the meantime, so this saved me a lot of time.
Nevertheless, such a merge costs time. Currently all files have been merged and can be compiled. There are still 166 undefined symbols at linking, so quite some stuff left to do.
I'll keep you posted.