[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 1a6a3a12a9247ad18bc68d77b48229e457c7a9c0 Author: Tor Lillqvist t...@iki.fi Date: Fri Oct 19 18:42:56 2012 +0300 In the 10.7 SDK CoreText is in the ApplicationServices framework Although I don't understand why this worked before, huh. Change-Id: I67ea314330630f331acaabd1c47128de6e340bb2 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d1dbad6..1ff3339 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -353,9 +353,15 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/aqua/source/gdi/coretext/salgdi \ )) +ifeq ($(MACOSX_SDK_VERSION),1070) +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + ApplicationServices \ +)) +else $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ CoreText \ )) +endif else # ATSUI ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 01207ca9851f79dd4aaf2b7a011bea7b8971d9c6 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Sep 21 14:51:32 2012 +0200 vcl/Library_vcl.mk: fix typo Change-Id: I4156bfdb9926a18e7e545d3e7684b87349a66528 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 2f2a2af..f1eb6f1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -511,8 +511,8 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/ppdparser \ $(if $(filter TRUE,$(ENABLE_CUPS)),\ vcl/unx/generic/printer/cupsmgr \ -vcl/unx/generic/printer/printerinfomanager, \ - else \ +vcl/unx/generic/printer/printerinfomanager \ + , \ vcl/null/printerinfomanager \ ) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 68e74da3ee12c8acae5c8106c2fc38c4f446c7c8 Author: Tor Lillqvist t...@iki.fi Date: Fri Sep 21 08:08:01 2012 +0300 No 64-bit Quicktime framework Change-Id: I9bcd9b5402e9c22568b2e6afd5b26ffbea40eb94 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 6c68a6f..2f2a2af 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -445,7 +445,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) $(eval $(call gb_Library_use_externals,vcl,\ -quicktime \ +$(if $(filter 64,$(BITNESS_OVERRIDE)),,quicktime) \ cocoa \ carbon \ corefoundation \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 937b80b044706d271dbb682f1d255a5a2fb4d5ef Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Sep 3 13:31:54 2012 +0200 version is WNT only library Change-Id: I3a6763abb76d244bf0a3117705130d1aeae98e2d diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 77ea232..d45ee98 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -309,7 +309,8 @@ ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/generic/glyphs/graphite_serverfont \ )) -else +endif +ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,vcl,\ version \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit 2e16eaf31c7a4849110020aebd5fbc97a1ab3e99 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Jun 13 13:14:41 2012 +0300 Need basebmp headers unconditionally Change-Id: I47f15178ffa910c60acb56a7df749db0b1efec55 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 69c1faa..cf09be5 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -317,15 +317,11 @@ $(eval $(call gb_Library_use_external,vcl,cairo)) endif -# GUIBASE specific stuff - -ifneq ($(filter headless android,$(GUIBASE)),) -# even in the case we do not link with basebmp, we still need the headers -# for some typedefs or enums $(eval $(call gb_Library_use_packages,vcl,\ basebmp_inc \ )) -endif + +# GUIBASE specific stuff ifeq ($(GUIBASE),aqua) $(eval $(call gb_Library_add_cxxflags,vcl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 9d1486da6e30f9a4a17eebfafc800f9a84fc49bf Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jun 4 12:29:13 2012 +0200 Find the internal lcms2 header Change-Id: I9ee6b40f28ffb5cc557cdcfff49287bd2e4b0fe2 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d397f04..53f9d4a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ $(if $(filter WNTGCC,$(OS)$(COM)),-I$(OUTDIR)/inc/external/wine) \ + $(if $(filter NO,$(SYSTEM_LCMS2)),-I$(OUTDIR)/inc/lcms2) \ )) $(eval $(call gb_Library_add_defs,vcl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 13aaac50bc5c37d4d9be97b441032dd7d6d02406 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Jun 2 23:58:05 2012 +0200 vcl: add dependency on basebmp's headers not implied by linking Change-Id: Ic35a980f7ddc45ce319fe6d78c93be33126380a6 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 8d9473a..75a1059 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -319,6 +319,11 @@ endif # GUIBASE specific stuff ifeq ($(GUIBASE),aqua) +# headers from basebmp are included but the library is not used ? +$(eval $(call gb_Library_use_packages,vcl,\ + basebmp_inc \ +)) + $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk |2 +- vcl/win/source/gdi/salgdi3.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c010c77dc3d240413d584d5837de4be1b164517e Author: Caolán McNamara caol...@redhat.com Date: Wed Dec 21 15:26:59 2011 + explicitly write an 8 bit empty string diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f18c18f..95a307f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -53,7 +53,7 @@ $(eval $(call gb_Library_set_include,vcl,\ )) $(eval $(call gb_Library_add_defs,vcl,\ --DVCL_DLLIMPLEMENTATION \ +-DVCL_DLLIMPLEMENTATION -DNOMINMAX \ -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \ -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 32fd0f3..8d86069 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -210,7 +210,7 @@ ImplFontAttrCache::~ImplFontAttrCache() ++aIter; } // EOF Marker -write_lenPrefixed_uInt8s_FromOString(aCacheFile, rtl::OString(), RTL_TEXTENCODING_UTF8); +write_lenPrefixed_uInt8s_FromOStringsal_uInt16(aCacheFile, rtl::OString()); } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/Library_vcl.mk
vcl/Library_vcl.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b1920bed1b9ef4a779539647208b333a4dc6712e Author: Jan Holesovsky ke...@suse.cz Date: Thu Sep 29 19:04:46 2011 +0200 Fix MinGW runtime; we need only the DLLPOSTFIX, no other magic. diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 07da2dd..0d479f0 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -56,7 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ -DCUI_DLL_NAME=\$(call gb_Library_get_runtime_filename,cui)\ \ --DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \ +-DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ )) $(eval $(call gb_Library_add_api,vcl,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
