Kaydet (Commit) 68617a21 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Disable gltf support on mac until freetype build problems are fixed

This reverts commit 68baa264.

Change-Id: Iea889a3188783f6c0d853f04e2b43442e0a692cc
üst 68baa264
......@@ -10368,7 +10368,7 @@ dnl ===================================================================
ENABLE_GLTF=
AC_MSG_CHECKING([whether to enable glTF support])
if test $_os != iOS -a $_os != Android -a $_os != WINNT -a "x$enable_gltf" != "xno"; then
if test $_os != iOS -a $_os != Android -a $_os != WINNT -a $_os != MACOSX -a "x$enable_gltf" != "xno"; then
ENABLE_GLTF=TRUE
AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE LIBGLTF"
......
......@@ -29,8 +29,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
--without-bzip2 \
--prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS) $(if $(filter MACOSX,$(OS)),-arch i386 -arch x86_64)" \
$(if $(filter MACOSX,$(OS)),LDFLAGS="-arch i386 -arch x86_64") \
CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \
&& chmod +x builds/unix/freetype-config \
&& $(MAKE) install \
&& touch $@ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment