[Libreoffice-commits] .: 2 commits - freetype/prj vcl/Module_vcl.mk

[Tor Lillqvist]

 freetype/prj/d.lst |    8 ++++----
 vcl/Module_vcl.mk  |    6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 76a27791fc715e612242a7a60a449efc82d4c0f8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Sun Dec 11 01:16:11 2011 +0200

    Build Library_vclplug_svp for Android, too

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 0a91f87..47da575 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -79,4 +79,10 @@ $(eval $(call gb_Module_add_targets,vcl,\
 ))
 endif
 
+ifeq ($(GUIBASE),android)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_svp \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
commit 0f43b8d39ba44521ad0f9bc1c3a7eaeb3c9d6f5c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Sun Dec 11 01:06:16 2011 +0200

    Don't bother with a freetype2 subdirectory for headers after all

diff --git a/freetype/prj/d.lst b/freetype/prj/d.lst
index 17cc4f8..428e6a0 100644
--- a/freetype/prj/d.lst
+++ b/freetype/prj/d.lst
@@ -2,7 +2,7 @@
 
 ..\%__SRC%\misc\build\freetype*\builds\unix\freetype-config %_DEST%\bin
 
-mkdir: %_DEST%\inc\external\freetype2\freetype\config
-..\%__SRC%\misc\build\freetype*\include\ft2build.h %_DEST%\inc\external\freetype2
-..\%__SRC%\misc\build\freetype*\include\freetype\*.h %_DEST%\inc\external\freetype2\freetype
-..\%__SRC%\misc\build\freetype*\include\freetype\config\*.h %_DEST%\inc\external\freetype2\freetype\config
+mkdir: %_DEST%\inc\external\freetype\config
+..\%__SRC%\misc\build\freetype*\include\ft2build.h %_DEST%\inc\external
+..\%__SRC%\misc\build\freetype*\include\freetype\*.h %_DEST%\inc\external\freetype
+..\%__SRC%\misc\build\freetype*\include\freetype\config\*.h %_DEST%\inc\external\freetype\config