Added static libs & updated makefiles