PORT-72: Updated the build system to try and simplify some windows
compiling settings.