RepositoryExternal.mk | 16 +++++++++++++--- vcl/Library_vcl.mk | 11 ++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-)
New commits: commit fd9c2cca78227f634e34790aa127cc31e4302a56 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Aug 13 10:00:55 2012 +0300 Bypass pdfwriter for non-desktop OSes without any Mozilla stuff for now Change-Id: I9ee43cb79212eba58c17c0f9679044e9c0cc9fae diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e6abe34..4aa52ab 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -211,9 +211,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/outmap \ vcl/source/gdi/pdfextoutdevdata \ vcl/source/gdi/pdffontcache \ - vcl/source/gdi/pdfwriter \ - vcl/source/gdi/pdfwriter_impl2 \ - vcl/source/gdi/pdfwriter_impl \ vcl/source/gdi/pngread \ vcl/source/gdi/pngwrite \ vcl/source/gdi/print2 \ @@ -287,6 +284,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # optional parts +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/source/gdi/pdfwriter \ + vcl/source/gdi/pdfwriter_impl2 \ + vcl/source/gdi/pdfwriter_impl \ +)) +endif + ## handle Graphite ifneq ($(ENABLE_GRAPHITE),) # add defines, graphite sources for all platforms commit 9dc7f059558aa4088b354ce509bf5044073ee01d Author: Tor Lillqvist <t...@iki.fi> Date: Mon Aug 13 09:19:35 2012 +0300 No Mozilla stuff on non-desktop OSes Change-Id: Ib2125fa688005c6139358959a45222fdd96c50d2 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 478bf25..5c0dd05 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1508,7 +1508,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ endif # SYSTEM_POSTGRESQL - +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifeq ($(SYSTEM_MOZILLA),YES) # Nothing needed here ATM @@ -1582,7 +1582,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(OUTDIR)/lib/mozreg_s.lib \ ) -endif +endif # !GCC else ifeq ($(GUI),UNX) @@ -1609,7 +1609,7 @@ $(call gb_LinkTarget_add_cxxflags,$(1),\ $(if $(filter MACOSX NETBSD,$(OS)),-Wno-deprecated) \ ) -endif +endif # UNX endef @@ -1624,6 +1624,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) endif # SYSTEM_MOZILLA +endif # DESKTOP ifeq ($(ENABLE_KDE),TRUE) @@ -1882,6 +1883,14 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef +ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) + +define gb_LinkTarget__use_nss3 + +endef + +else + ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_nss3 @@ -1937,6 +1946,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef endif +endif # DESKTOP ### Jars ############################################################ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits