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 /canvas | |
| parent | gtk[3|4] gtk_widget_get_root returns null when no root (diff) | |
| download | core-c22f23556d03e1ac0c8be7a79597c822b7e29fc9.tar.gz core-c22f23556d03e1ac0c8be7a79597c822b7e29fc9.zip | |
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 'canvas')
| -rw-r--r-- | canvas/Executable_canvasdemo.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/canvas/Executable_canvasdemo.mk b/canvas/Executable_canvasdemo.mk index 8af599ff1760..e47ae11dd13f 100644 --- a/canvas/Executable_canvasdemo.mk +++ b/canvas/Executable_canvasdemo.mk @@ -31,26 +31,12 @@ $(eval $(call gb_Executable_use_libraries,canvasdemo,\ tl \ sal \ salhelper \ - vcl \ )) $(eval $(call gb_Executable_add_exception_objects,canvasdemo,\ canvas/workben/canvasdemo \ )) -$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\ - vclmain \ -)) - -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Executable_add_libs,canvasdemo,\ - -lm $(DLOPEN_LIBS) \ - -lX11 \ -)) - -$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\ - glxtest \ -)) -endif +$(eval $(call gb_Executable_use_vclmain,canvasdemo)) # vim: set noet sw=4 ts=4: |