Need more preprocessor crap to work on mac, updated mac makefile