more windows makefile tweaks