mirror of https://github.com/vitalif/openscad
freetype and harfbuzz build fixes, updated gettext, ffi, glib, harfbuzz
parent
c73dfa6e8e
commit
1d5ff65e04
|
@ -495,7 +495,7 @@ build_freetype()
|
|||
fi
|
||||
tar xzf "freetype-$version.tar.gz"
|
||||
cd "freetype-$version"
|
||||
./configure --prefix="$DEPLOYDIR" CFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN LDFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN $extra_config_flags
|
||||
PKG_CONFIG_LIBDIR="$DEPLOYDOR/lib/pkgconfig" ./configure --prefix="$DEPLOYDIR" CFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN LDFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN $extra_config_flags
|
||||
make -j"$NUMCPU"
|
||||
make install
|
||||
}
|
||||
|
@ -627,7 +627,7 @@ build_harfbuzz()
|
|||
# disable doc directories as they make problems on Mac OS Build
|
||||
sed -e "s/SUBDIRS = src util test docs/SUBDIRS = src util test/g" Makefile.am > Makefile.am.bak && mv Makefile.am.bak Makefile.am
|
||||
sed -e "s/^docs.*$//" configure.ac > configure.ac.bak && mv configure.ac.bak configure.ac
|
||||
./autogen.sh --prefix="$DEPLOYDIR" --with-freetype=yes --with-gobject=no --with-cairo=no --with-icu=no CFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN LDFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN $extra_config_flags
|
||||
PKG_CONFIG_LIBDIR="$DEPLOYDIR/lib/pkgconfig" ./autogen.sh --prefix="$DEPLOYDIR" --with-freetype=yes --with-gobject=no --with-cairo=no --with-icu=no CFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN LDFLAGS=-mmacosx-version-min=$MAC_OSX_VERSION_MIN $extra_config_flags
|
||||
make -j$NUMCPU
|
||||
make install
|
||||
}
|
||||
|
@ -719,12 +719,12 @@ build_boost 1.54.0
|
|||
# NB! For CGAL, also update the actual download URL in the function
|
||||
build_cgal 4.4
|
||||
build_glew 1.10.0
|
||||
build_gettext 0.18.3.1
|
||||
build_libffi 3.0.13
|
||||
build_glib2 2.38.2
|
||||
build_gettext 0.18.3.2
|
||||
build_libffi 3.1
|
||||
build_glib2 2.40.0
|
||||
build_opencsg 1.3.2
|
||||
build_freetype 2.5.3 --without-png
|
||||
build_harfbuzz 0.9.27 "--with-coretext=auto --with-glib=no"
|
||||
build_harfbuzz 0.9.28 "--with-coretext=auto --with-glib=no"
|
||||
export FREETYPE_CFLAGS="-I$DEPLOYDIR/include -I$DEPLOYDIR/include/freetype2"
|
||||
export FREETYPE_LIBS="-L$DEPLOYDIR/lib -lfreetype"
|
||||
build_libxml2 2.9.1
|
||||
|
|
Loading…
Reference in New Issue