vcl/Library_vcl.mk | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
New commits: commit 1e877f46c6ce601692e8e229e7c856cd737866c3 Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Jan 17 22:06:22 2021 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Sun Jan 17 21:41:04 2021 +0100 Expand vcl_quartz_code and vcl_coretext_code macros that were used only once The macOS-specific code is nowadays compiled in Library_vclplug_osx.mk so these macros that listed files compiled both for iOS and macOS were used only for iOS in this makefile anyway. Change-Id: I607ce0bd8834b81caff664f28419e50e87af87f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109484 Tested-by: Tor Lillqvist <[email protected]> Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 51b45594f97f..9bb7906eb39f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -500,16 +500,6 @@ $(eval $(call gb_Library_add_cobjects,vcl,\ vcl/source/filter/jpeg/transupp \ )) -vcl_quartz_code= \ - vcl/quartz/salbmp \ - vcl/quartz/utils \ - vcl/quartz/salgdicommon \ - vcl/quartz/salvd \ - -vcl_coretext_code= \ - vcl/quartz/ctfonts \ - vcl/quartz/salgdi \ - vcl_headless_code= \ vcl/headless/svpframe \ $(if $(filter-out iOS,$(OS)), \ @@ -689,8 +679,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/ios/iOSTransferable \ vcl/ios/DataFlavorMapping \ vcl/ios/HtmlFmtFlt \ - $(vcl_coretext_code) \ - $(vcl_quartz_code) \ + vcl/quartz/ctfonts \ + vcl/quartz/salbmp \ + vcl/quartz/salgdi \ + vcl/quartz/salgdicommon \ + vcl/quartz/salvd \ + vcl/quartz/utils \ $(vcl_headless_code) \ )) $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
