move the conditional settings up
remove commented out define for portable builds, there is a enviromental setting for it
remove the conditional define for w7api, its hard set anyway