Merge pull request #7155 from natural-law/v3

Optimize the win32 projects configuration.