Fix #1599

Compiler-specific options are now read with the '{compiler}.cpp' prefix in C++ mode.
 GCC C++ mode is fixed.
Merge pull request #1604 from Varriount/fix-1599

Fix #1599