more cleanup of config.h mess

* modify a couple of cmakedefine01s to cmakedefines
* needed to build successfully on MSW, where both defines shouldn't be set