diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 07:13:15 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-26 22:51:05 +0200 |
| commit | c22f23556d03e1ac0c8be7a79597c822b7e29fc9 (patch) | |
| tree | 7fc70cfda9a1db747ace9725fbf3fa61b7f2f12b /vcl/Executable_ui-previewer.mk | |
| parent | ca242dfefa03016a9b0f675cb91b4605ce80875d (diff) | |
gbuild: Handle glxtest + vclmain usage via macros
Use a macro to do the same checks for all Executable with glxtest
or vclmain usage. Both are static libraries, so every user has the
same dependencies. Introduces:
* gb_Executable_use_vclmain
* gb_Executable_use_glxtest
Change-Id: Ib80b4e7c6f5078d47ad8f1ec5708a7174415f705
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116145
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/Executable_ui-previewer.mk')
| -rw-r--r-- | vcl/Executable_ui-previewer.mk | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index bee97cbac14b..6cabf4f6710b 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -16,10 +16,6 @@ $(eval $(call gb_Executable_use_api,ui-previewer,\ udkapi \ )) -$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ - vclmain \ -)) - $(eval $(call gb_Executable_use_libraries,ui-previewer,\ comphelper \ cppu \ @@ -27,9 +23,10 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\ sal \ tl \ ucbhelper \ - vcl \ )) +$(eval $(call gb_Executable_use_vclmain,ui-previewer)) + $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ vcl/source/uipreviewer/previewer \ )) @@ -38,17 +35,6 @@ $(eval $(call gb_Executable_add_defs,ui-previewer,\ -DVCL_INTERNALS \ )) -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Executable_add_libs,ui-previewer,\ - -lm $(DLOPEN_LIBS) \ - -lX11 \ -)) - -$(eval $(call gb_Executable_use_static_libraries,ui-previewer,\ - glxtest \ -)) -endif - $(eval $(call gb_Executable_add_default_nativeres,ui-previewer)) # vim: set noet sw=4 ts=4: |