Fixed Windows issue (I think), now building separate Mac and non-Mac versions