Fixes for #1473 and #1476
Added debug builds to make_versioninfo
Removed some more defines
5 files changed