Added fixes to get oF make system working through the linking stage on windows using msys