search

pete-gordon / oricutron

Portable Oric-1/Atmos/Telestrat and Pravetz 8D emulator
http://www.petergordon.org.uk/oricutron/
GNU General Public License v2.0
69 stars 25 forks source link

Master www merge #196

Closed seclorum closed 3 months ago

seclorum commented 3 months ago

This is a merge of iss/Hialmars' work on the www branch to master, with fixes to the conflicts found, and an additional dependency 'needed' in the www/CMakeLists.txt. I have confirmed this produces a working Oricutron target for html, loaded quite a few .TAP files, and so on. Submitting this PR only to make it easier for others to test.

seclorum commented 3 months ago

See discussion here:

https://forum.defence-force.org/viewtopic.php?p=29765#p29765

Willing to test anything else required to get the www- branch merged to master, as it is indeed pretty cool work on the part of @iss and @hialmar ..

iss000 commented 3 months ago

I've looked quickly at all changes and I didn't found something which can break the main build/functionality of Oricutron. So, let's merge www :) We can always go back if needed...

seclorum commented 3 months ago

Yes, go go go! This is great work from you guys, and it will be very fun to see the Oric emulated all over the web! :)