fixed makefile.  Updated mac preprocessor definitions