Fix use of new GetCompileOptions API.
VS6: Rename some variables to correspond to config values.

This simplifies population of the compile flags.
Merge topic 'target-COMPILE_OPTIONS' into next

ad945e0 VS6: Rename some variables to correspond to config values.
8b29b88 Fix use of new GetCompileOptions API.