Consolidated separated Makefiles for Unix and Win32 into one