diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2014-04-22 00:41:57 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2014-04-22 01:17:10 +0200 |
| commit | fe5dbe3847838aae3dff246451969eba4c3decda (patch) | |
| tree | 96c84659b1db0c77a190143a5af274b43446e149 /external | |
| parent | 0f72d53c05b823b8baaa29c452d09243e52afb5a (diff) | |
libgltf: Make it link with freetype on Windows.
Change-Id: I57dcde58bb017ab087908154bc4a1af6d5d152b9
Diffstat (limited to 'external')
| -rw-r--r-- | external/freetype/ExternalPackage_freetype.mk | 20 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk deleted file mode 100644 index 5e2f381118b2..000000000000 --- a/external/freetype/ExternalPackage_freetype.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype)) - -$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype)) - -ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_files,freetype,$(call gb_UnpackedTarball_get_dir,freetype/instdir), \ - objs/win32/vc2010/freetype248.lib \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk index cb9bbc9ec9d4..f6e316d9f8bc 100644 --- a/external/freetype/Module_freetype.mk +++ b/external/freetype/Module_freetype.mk @@ -14,7 +14,6 @@ ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) $(eval $(call gb_Module_add_targets,freetype,\ ExternalProject_freetype \ UnpackedTarball_freetype \ - ExternalPackage_freetype \ )) endif |