diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 10:10:39 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-18 11:19:26 +0200 |
| commit | b6cbb15026e2df1e985f19c5bb723f64a26f2658 (patch) | |
| tree | 2e8aa9e3d15b78dbc1b08b12b0f94e2292bd8129 /external | |
| parent | ec95e6a17c591bff6c0582c304c1beeb1efe141f (diff) | |
Freetype is needed by libgltf on all platforms
Change-Id: I042cbc5f4cabfa7ec387594189e2f86be6ec7fbf
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 20 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 2 | ||||
| -rw-r--r-- | external/freetype/README | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index aa9a1b7ee03a..11fcba55530a 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -14,16 +14,16 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ )) $(call gb_ExternalProject_get_state_target,freetype,build) : - cd $(EXTERNAL_WORKDIR) \ - && CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ + $(call gb_ExternalProject_run,build,\ ./configure \ - --disable-shared \ - --without-zlib \ - --without-bzip2 \ - --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - && chmod +x builds/unix/freetype-config \ - && $(MAKE) install \ - && touch $@ + --disable-shared \ + --without-zlib \ + --without-bzip2 \ + --prefix=$(call gb_UnpackedTarball_get_dir,freetype/instdir) \ + --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ + && chmod +x builds/unix/freetype-config \ + && $(MAKE) install \ + && touch $@ ) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index 51badc871998..9ff2582def01 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,freetype)) -ifeq ($(OS),ANDROID) +ifneq (,$(or $(filter-out ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ diff --git a/external/freetype/README b/external/freetype/README index c90f9509fb1a..481466432abf 100644 --- a/external/freetype/README +++ b/external/freetype/README @@ -1,8 +1,6 @@ -This "bundled" freetype is built only in an Android build - FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display servers, font conversion tools, text image generation tools, and many other products as well. -From [http://freetype.sourceforge.net/freetype2/index.html]
\ No newline at end of file +From [http://freetype.sourceforge.net/freetype2/index.html] |