second part of windows/osx macro change - forgot *.cpp files