Added preprocessor directives and Makefile logic to support OS X