[Libreoffice-commits] core.git: external/freetype

[Markus Mohrhard]

 external/freetype/ExternalPackage_freetype.mk |   20 ++++++++++++++++++++
 external/freetype/ExternalProject_freetype.mk |    9 +++++++++
 external/freetype/Module_freetype.mk          |    1 +
 3 files changed, 30 insertions(+)

New commits:
commit 49fa9c93e1245439724641b2668f109d1f494511
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Apr 18 16:14:41 2014 +0200

    use the visual studio project file
    
    Change-Id: Ie0914715676830f073cce869183d8db6260fe208

diff --git a/external/freetype/ExternalPackage_freetype.mk b/external/freetype/ExternalPackage_freetype.mk
new file mode 100644
index 0000000..5e2f381
--- /dev/null
+++ b/external/freetype/ExternalPackage_freetype.mk
@@ -0,0 +1,20 @@
+# -*- 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/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk
index 11fcba5..464a221 100644
--- a/external/freetype/ExternalProject_freetype.mk
+++ b/external/freetype/ExternalProject_freetype.mk
@@ -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:
diff --git a/external/freetype/Module_freetype.mk b/external/freetype/Module_freetype.mk
index f6e316d..cb9bbc9 100644
--- a/external/freetype/Module_freetype.mk
+++ b/external/freetype/Module_freetype.mk
@@ -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