Windows and OS X support for the Makefile