Even further makefile/project file fixes for Win64.