diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 12:06:54 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-20 12:06:54 +0200 |
| commit | 68617a21a26a3cf9daa35b1f31f3b8f4aa56ddd0 (patch) | |
| tree | dac6af84dbba08e9ac2740e4476e0f28e35c33c8 /external | |
| parent | 68baa264a5c36f99bf946fae92e0faef53b737f3 (diff) | |
Disable gltf support on mac until freetype build problems are fixed
This reverts commit 68baa264a5c36f99bf946fae92e0faef53b737f3.
Change-Id: Iea889a3188783f6c0d853f04e2b43442e0a692cc
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 3 |
1 files changed, 1 insertions, 2 deletions
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 $@ ) |