diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-16 14:37:24 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-17 12:44:39 +0100 |
| commit | 5da906d07bf88bb9c56325d03272006d5a0662c4 (patch) | |
| tree | 16763a743098db8f184bcd7cc9060ddeb8815a6f /vcl/Library_vcl.mk | |
| parent | 6985f81b528b0e06bd3b11160c35ed2d4a999845 (diff) | |
iOS+SVP convert remaining VCL plugins to salplug
While this makes the preprocessor usage even larger, the code in
salplug.cxx is now hopefully easier to follow. I added a comment
about the main code structure at the beginning.
It also includes changes to the generic plugin list to include
gtk3_kde5 before gen, qt5 and qt6 after gen, but still skips the
headless / svp plugin.
And I explicitly excluded salplug.cxx from the externandnotdefined
compiler plugin. I could have added a dummy, but that seemed not
worth the effort. My try on a non-dummy with correct includes and
defines made the code in salplug.cxx much harder to follow.
FWIW, the iOS VCL plugin actually seems to use the osx SalData, so
I think these changes to iosinst.cxx are more correct then commit
7d990aafdc363b2a12b5db78637d7f3bef7780bd ("VCL drop m_pInstance
from *nix SalData"). But hard to tell without a compiler.
Change-Id: I0e2944d4221ca5910fb2120cc8b24def5c5b3f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128477
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 4712da2f716f..42282268b8ce 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -391,6 +391,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/app/help \ vcl/source/app/i18nhelp \ vcl/source/app/idle \ + vcl/source/app/salplug \ vcl/source/app/salusereventlist \ vcl/source/app/salvtables \ vcl/source/app/scheduler \ @@ -529,7 +530,6 @@ vcl_headless_code= \ vcl/headless/SvpGraphicsBackend \ vcl/headless/CairoCommon \ vcl/headless/BitmapHelper \ - $(if $(ENABLE_HEADLESS),vcl/headless/svpdata) \ ) \ vcl/headless/svpdummies \ vcl/headless/svpinst \ @@ -621,9 +621,6 @@ endif # !DISABLE_GUI # * select headless code and corresponding libraries # $(eval $(call gb_Library_add_exception_objects,vcl,\ - $(if $(filter-out iOS,$(OS)), \ - vcl/source/app/salplug \ - ) \ $(if $(USE_HEADLESS_CODE), \ $(if $(ENABLE_CUPS), \ vcl/unx/generic/printer/cupsmgr \ |