Removed WIN32 stuff. Updated makefile