fix static build on linux.
Merge branch 'develop' into oldschool