Cleanup Windows build parameters on master branch

Release-6.3 introduced some new compilation parameters for the Windows build, but the master branch has changed where these are kept. I merged release-6.3 into master and kept the new parameters at their old location, but they should be updated to match the rest of the parameters there.