diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 2ab350f186e8..b6c45848b75b 100644 --- a/configure.ac +++ b/configure.ac @@ -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" diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index a9dbef6236bb..464a22107d18 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -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 $@ ) |