partial makefile fix, need to push more code from windows first.