RF: refactor to terryfy library installers

matthew-brett · matthew-brett · commit f6abb5c4e62d · 2014-07-04T13:33:15.000+01:00
diff --git a/library_installers.sh b/library_installers.sh
diff --git a/run_install.sh b/run_install.sh
@@ -1,14 +1,18 @@
 source terryfy/travis_tools.sh
-source library_installers.sh
+source terryfy/library_installers.sh
+
+# Package versions for fresh source builds
+FT_VERSION=2.5.3
+PNG_VERSION=1.6.12
+ZLIB_VERSION=1.2.8
 
 # Need cmake for openjpeg
 brew install cmake
 # Need pkg-config for freetype to find libpng
 brew install pkg-config
 # Set up build
-init_vars
 clean_builds
 # Need zlib for compatibility with new libpng on OSX 10.6
-install_zlib
-install_libpng
-install_freetype
+standard_install zlib $ZLIB_VERSION .tar.xz
+standard_install libpng $PNG_VERSION
+standard_install freetype $FT_VERSION .tar.gz freetype- "--with-harfbuzz=no"
diff --git a/terryfy b/terryfy
@@ -1 +1 @@
-Subproject commit 012b6635139dd3f52cd17c5c51c17c39aa7f52b1
+Subproject commit 1c45b3549b663a037f62ee3a02fd64761806d396
