diff options
| -rw-r--r-- | RepositoryExternal.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | external/freetype/ExternalPackage_freetype.mk | 20 | ||||
| -rw-r--r-- | external/freetype/Module_freetype.mk | 1 |
4 files changed, 4 insertions, 21 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e0a7fef34596..a8b9516c3682 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1267,6 +1267,7 @@ endef define gb_LinkTarget__use_freetype $(call gb_LinkTarget_use_external,$(1),freetype_headers) +$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS)) endef diff --git a/configure.ac b/configure.ac index bc5cfd78c7cb..bfc00bd49ad9 100644 --- a/configure.ac +++ b/configure.ac @@ -10378,6 +10378,9 @@ if test $_os != iOS -a $_os != Android -a $_os != Darwin -a "x$enable_gltf" != " BUILD_TYPE="$BUILD_TYPE LIBGLTF" if test "$test_freetype" = "no"; then BUILD_TYPE="$BUILD_TYPE FREETYPE" + if test "$COM" = "MSC"; then + FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248.lib" + fi fi else AC_MSG_RESULT([no]) 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 |