updated Makefile and some defines to allow compilation under windows