Hopefully last round of fixes for all OSes

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@54815 954f8c5b-7b00-dc11-b283-0030488c597c