- windows build restored
- some tweaks to build system
Linux build fixed