Built cross-platform-shapes from commit 5059bb2 on branch master