Fix windows makefile and CI integration