diff --git a/mac_build/buildFTGL.sh b/mac_build/buildFTGL.sh index 39111b1446..219f42adad 100644 --- a/mac_build/buildFTGL.sh +++ b/mac_build/buildFTGL.sh @@ -24,6 +24,7 @@ # [path]/ftgl-2.1.3~rc5/src/.libs/libftgl.a # # by Charlie Fenton 7/27/12 +# Updated 2/7/14 for OS 10.9 # ## This script requires OS 10.6 or later # @@ -87,7 +88,7 @@ export CPPFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED= export CFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040" export SDKROOT="${SDKPATH}" -./configure --enable-shared=NO --disable-freetypetest --host=i386 +./configure --enable-shared=NO --disable-freetypetest --with-ft-prefix="`pwd`/../freetype_install/" --host=i386 if [ $? -ne 0 ]; then return 1; fi if [ "$1" = "-clean" ]; then @@ -113,7 +114,7 @@ export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWE export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1040 -DMAC_OS_X_VERSION_MIN_REQUIRED=1040" export SDKROOT="${SDKPATH}" -./configure --enable-shared=NO --disable-freetypetest --host=x86_64 +./configure --enable-shared=NO --disable-freetypetest --with-ft-prefix="`pwd`/../freetype_install/" --host=x86_64 if [ $? -ne 0 ]; then rm -f src/libftgl_i386.a return 1; diff --git a/mac_build/buildfreetype.sh b/mac_build/buildfreetype.sh index 608124c476..68fc4139c6 100644 --- a/mac_build/buildfreetype.sh +++ b/mac_build/buildfreetype.sh @@ -24,6 +24,7 @@ # [path]/freetype-2.4.10/objs/.libs/libfreetype.a # # by Charlie Fenton 7/27/12 +# Updated 2/7/14 for OS 10.9 # ## This script requires OS 10.6 or later # @@ -83,6 +84,7 @@ rm -fR objs/*.* rm -fR objs/* cp -p README-objs objs/README rm -f README-objs +rm -fR "../freetype_install/" if [ $? -ne 0 ]; then return 1; fi @@ -94,7 +96,7 @@ export CFLAGS="-isysroot ${SDKPATH} -arch i386 -DMAC_OS_X_VERSION_MAX_ALLOWED=10 export SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.4 -./configure --enable-shared=NO --host=i386 +./configure --enable-shared=NO --prefix="`pwd`/../freetype_install/" --host=i386 if [ $? -ne 0 ]; then return 1; fi if [ "$1" = "-clean" ]; then @@ -116,7 +118,7 @@ export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED= export SDKROOT="${SDKPATH}" export MACOSX_DEPLOYMENT_TARGET=10.5 -./configure --enable-shared=NO --host=x86_64 +./configure --enable-shared=NO --prefix="`pwd`/../freetype_install/" --host=x86_64 if [ $? -ne 0 ]; then return 1; fi make @@ -131,6 +133,13 @@ if [ $? -ne 0 ]; then return 1; fi rm -f objs/.libs/libfreetype_i386.a rm -f objs/.libs/libfreetype_x86_64.a +# Building ftgl requires [install-path]/bin.freetype-config +make install + +# remove installed items not needed by ftgl build +rm -fR "../freetype_install/lib" +rm -fR "../freetype_install/share" + export CC="";export CXX="" export LDFLAGS="" export CPPFLAGS="" diff --git a/mac_build/buildsqlite3.sh b/mac_build/buildsqlite3.sh index 412b4acb45..ae419b7114 100644 --- a/mac_build/buildsqlite3.sh +++ b/mac_build/buildsqlite3.sh @@ -39,7 +39,7 @@ if [ "$1" != "-clean" ]; then if [ -f .libs/libsqlite3.a ]; then - echo "c3.7.14.1 already built" + echo "sqlite-3.7.14.1 already built" return 0 fi fi