Port over changes/fixes from Dune 2000
Revert mistakenly adding patch ovjs to the "pure" Makefiles
Merge branch 'pure'
Trying out loading extra options in C++