diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 12:49:53 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-02 11:24:17 +0200 |
commit | 3af4e1a0825c5b11ae4ef58fc411378aab669387 (patch) | |
tree | 93ade9e533d4b034ea42460e2b3f0e003edf85a0 /vcl/Library_vcl.mk | |
parent | 1698debed2993fc5f262aa3ebbdb32fc112ac556 (diff) |
Implement MacOSX VCL backend as plugin
Change-Id: Ie90af62eff146064c3b066a8f7ca1c3a69f44c39
Reviewed-on: https://gerrit.libreoffice.org/61102
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/Library_vcl.mk')
-rw-r--r-- | vcl/Library_vcl.mk | 126 |
1 files changed, 13 insertions, 113 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 095e040154c9..d8fd456b3417 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -89,22 +89,6 @@ $(eval $(call gb_Library_use_libraries,vcl,\ xmlreader \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_libs,vcl,\ - -framework IOKit \ - -F/System/Library/PrivateFrameworks \ - -framework CoreUI \ - -lobjc \ -)) -endif -ifeq ($(OS),MACOSX) - -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $(gb_OBJCXXFLAGS) \ -)) - -endif - ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Library_use_libraries,vcl,\ jvmaccess \ @@ -443,8 +427,6 @@ $(eval $(call gb_Library_add_cobjects,vcl,\ vcl/source/filter/jpeg/transupp \ )) -# optional parts - vcl_quartz_code= \ vcl/quartz/salbmp \ vcl/quartz/utils \ @@ -455,100 +437,6 @@ vcl_coretext_code= \ vcl/quartz/ctfonts \ vcl/quartz/salgdi \ -ifeq ($(OS),MACOSX) - -$(eval $(call gb_Library_add_cxxflags,vcl,\ - $(gb_OBJCXXFLAGS) \ -)) - -$(eval $(call gb_Library_add_defs,vcl,\ - -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \ -)) - -$(eval $(call gb_Library_add_exception_objects,vcl,\ - $(vcl_coretext_code) \ -)) - -$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ - ApplicationServices \ -)) - -$(eval $(call gb_Library_add_objcxxobjects,vcl,\ - vcl/osx/a11yactionwrapper \ - vcl/osx/a11ycomponentwrapper \ - vcl/osx/a11yfactory \ - vcl/osx/a11yrolehelper \ - vcl/osx/a11yselectionwrapper \ - vcl/osx/a11ytablewrapper \ - vcl/osx/a11ytextattributeswrapper \ - vcl/osx/a11ytextwrapper \ - vcl/osx/a11yutil \ - vcl/osx/a11yvaluewrapper \ - vcl/osx/a11ywrapper \ - vcl/osx/a11ywrapperbutton \ - vcl/osx/a11ywrappercheckbox \ - vcl/osx/a11ywrappercombobox \ - vcl/osx/a11ywrappergroup \ - vcl/osx/a11ywrapperlist \ - vcl/osx/a11ywrapperradiobutton \ - vcl/osx/a11ywrapperradiogroup \ - vcl/osx/a11ywrapperrow \ - vcl/osx/a11ywrapperscrollarea \ - vcl/osx/a11ywrapperscrollbar \ - vcl/osx/a11ywrappersplitter \ - vcl/osx/a11ywrapperstatictext \ - vcl/osx/a11ywrappertabgroup \ - vcl/osx/a11ywrappertextarea \ - vcl/osx/a11ywrappertoolbar \ - vcl/osx/salnstimer \ - vcl/osx/vclnsapp \ - vcl/osx/printaccessoryview \ - vcl/osx/printview \ - vcl/osx/salframeview \ - vcl/osx/salnsmenu \ -)) -$(eval $(call gb_Library_add_exception_objects,vcl,\ - vcl/osx/a11yfocuslistener \ - vcl/osx/a11yfocustracker \ - vcl/osx/a11ylistener \ - vcl/osx/documentfocuslistener \ - vcl/osx/saldata \ - vcl/osx/salinst \ - vcl/osx/salsys \ - vcl/osx/saltimer \ - vcl/osx/DataFlavorMapping \ - vcl/osx/DragActionConversion \ - vcl/osx/DragSource \ - vcl/osx/DragSourceContext \ - vcl/osx/DropTarget \ - vcl/osx/HtmlFmtFlt \ - vcl/osx/OSXTransferable \ - vcl/osx/PictToBmpFlt \ - vcl/osx/clipboard \ - vcl/osx/service_entry \ - $(vcl_quartz_code) \ - vcl/quartz/salgdiutils \ - vcl/osx/salnativewidgets \ - vcl/osx/salprn \ - vcl/osx/salframe \ - vcl/osx/salmenu \ - vcl/osx/salobj \ -)) -$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ - $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \ - Cocoa \ - Carbon \ - CoreFoundation \ -)) - -ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) -$(eval $(call gb_Library_use_libraries,vcl,\ - AppleRemote \ -)) -endif - -endif - vcl_headless_code= \ vcl/headless/svpframe \ $(if $(filter-out IOS,$(OS)), \ @@ -709,6 +597,7 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif + ifeq ($(OS),IOS) $(eval $(call gb_Library_add_cxxflags,vcl,\ $(gb_OBJCXXFLAGS) \ @@ -727,7 +616,18 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ )) endif -# OS-specific stuff + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ + Cocoa \ + CoreFoundation \ +)) + +$(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/osx/salplug \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ |