Added CXX and CXXCPP flags