fixes for compiling on Windows with Visual Studio 2010.
Trying to get Makefile to work on Windows AND Linux.