New style make
Fixed makefile
Updated eclipse project and makefiles for windows