Kaydet (Commit) 49fa9c93 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

use the visual studio project file

Change-Id: Ie0914715676830f073cce869183d8db6260fe208
üst 89f6ff4c
# -*- 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:
......@@ -13,6 +13,14 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\
build \
))
ifeq ($(OS)$(COM),WNTMSC)
$(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
cd ../builds/win32/vc2010/ && \
msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
,objs)
else
$(call gb_ExternalProject_get_state_target,freetype,build) :
$(call gb_ExternalProject_run,build,\
./configure \
......@@ -25,5 +33,6 @@ $(call gb_ExternalProject_get_state_target,freetype,build) :
&& chmod +x builds/unix/freetype-config \
&& $(MAKE) install \
&& touch $@ )
endif
# vim: set noet sw=4 ts=4:
......@@ -14,6 +14,7 @@ ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
$(eval $(call gb_Module_add_targets,freetype,\
ExternalProject_freetype \
UnpackedTarball_freetype \
ExternalPackage_freetype \
))
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment