From 5da906d07bf88bb9c56325d03272006d5a0662c4 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sun, 16 Jan 2022 14:37:24 +0100 Subject: 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 --- vcl/Library_vcl.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'vcl/Library_vcl.mk') 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 \ -- cgit