incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1167562 - in /incubator/ooo/trunk/main: Repository.mk RepositoryFixes.mk vcl/Library_vcl.mk
Date Sat, 10 Sep 2011 17:35:49 GMT
Author: erack
Date: Sat Sep 10 17:35:48 2011
New Revision: 1167562

URL: http://svn.apache.org/viewvc?rev=1167562&view=rev
Log:
ooo34gsl01: #i117680# fixup graphite_dll as static library

# User Philipp Lohmann [pl] <Philipp.Lohmann@oracle.com>

Modified:
    incubator/ooo/trunk/main/Repository.mk
    incubator/ooo/trunk/main/RepositoryFixes.mk
    incubator/ooo/trunk/main/vcl/Library_vcl.mk

Modified: incubator/ooo/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/Repository.mk?rev=1167562&r1=1167561&r2=1167562&view=diff
==============================================================================
--- incubator/ooo/trunk/main/Repository.mk (original)
+++ incubator/ooo/trunk/main/Repository.mk Sat Sep 10 17:35:48 2011
@@ -100,7 +100,6 @@ $(eval $(call gb_Helper_register_librari
 	cppunit \
 	icuuc \
 	icule \
-	graphite_dll \
 	cppunit \
 	rdf \
 	xslt \

Modified: incubator/ooo/trunk/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/RepositoryFixes.mk?rev=1167562&r1=1167561&r2=1167562&view=diff
==============================================================================
--- incubator/ooo/trunk/main/RepositoryFixes.mk (original)
+++ incubator/ooo/trunk/main/RepositoryFixes.mk Sat Sep 10 17:35:48 2011
@@ -124,6 +124,7 @@ gb_Library_FILENAMES := $(patsubst xml2:
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 ifeq ($(gb_PRODUCT),$(true))
 gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
 else
@@ -133,7 +134,6 @@ gb_Library_NOILIBFILENAMES:=\
 	advapi32 \
 	gdi32 \
 	gdiplus \
-	graphite_dll \
 	gnu_getopt \
 	icuuc \
 	icule \

Modified: incubator/ooo/trunk/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vcl.mk?rev=1167562&r1=1167561&r2=1167562&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vcl.mk Sat Sep 10 17:35:48 2011
@@ -81,13 +81,6 @@ $(eval $(call gb_Library_add_linked_libs
 	$(gb_STDLIBS) \
 ))
 
-ifneq ($(ENABLE_GRAPHITE),)
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,vcl,\
-    graphite_dll \
-))
-endif
-endif
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_linked_libs,vcl,\
     freetype \
@@ -423,6 +416,7 @@ $(eval $(call gb_Library_add_exception_o
 
 ## handle Graphite
 ifneq ($(ENABLE_GRAPHITE),)
+# add defines, graphite sources for all platforms
 $(eval $(call gb_Library_set_defs,vcl,\
 	$$(DEFS) \
 	-DENABLE_GRAPHITE \
@@ -433,6 +427,7 @@ $(eval $(call gb_Library_add_exception_o
     vcl/source/glyphs/graphite_layout \
     vcl/source/glyphs/graphite_textsrc \
 ))
+# handle X11 platforms, which have additional files and possibly system graphite
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/glyphs/graphite_adaptors \
@@ -449,6 +444,12 @@ $(eval $(call gb_Library_add_linked_stat
 ))
 endif
 endif
+# on windows link static graphite library
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_static_libs,vcl,\
+    graphite \
+))
+endif
 endif
 
 ifeq ($(OS),LINUX)



Mime
View raw message