Tried updating Makefile to make Windows builds easier