Clean up the MVSC nmake files so they work again.

Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."
Merge remote-tracking branch 'origin/maint-0.2.5'