Makefile changes for windows
Makefile compat changes for win32