Changing the C++ options to the project defaults for easier integration