Fixed windows build with new Makefile/configure