updated Makefile and changed some defines to allow compilation under Windows