I am looking to use in the cpp files, so I can just use ifdef LINUX it looks like

What you mean you can't? Not saying that you have to, but LINUX is passed as a define.

I mean that in 3.3.1 branch, I don't think LINUX was defined in our build. So I had to tweak some files. Looks like your new build system does.

ah I see!