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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/Executable_gengal.mk | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 1ec8841c1ab3..fdf3eb3843bc 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -44,18 +44,15 @@ $(eval $(call gb_Executable_use_libraries,gengal,\ cppu \ cppuhelper \ utl \ - vcl \ svxcore \ )) +$(eval $(call gb_Executable_use_vclmain,gengal)) + $(eval $(call gb_Executable_add_exception_objects,gengal,\ svx/source/gengal/gengal \ )) -$(eval $(call gb_Executable_use_static_libraries,gengal,\ - vclmain \ -)) - ifeq ($(OS),WNT) $(eval $(call gb_Executable_use_system_win32_libs,gengal,\ kernel32 \ @@ -65,25 +62,6 @@ $(eval $(call gb_Executable_use_system_win32_libs,gengal,\ )) endif -ifeq ($(DISABLE_GUI),TRUE) -$(eval $(call gb_Executable_add_libs,gengal,\ - $(DLOPEN_LIBS) \ -)) -else -ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) -$(eval $(call gb_Executable_add_libs,gengal,\ - $(DLOPEN_LIBS) \ - -lX11 \ -)) - -ifeq ($(USING_X11),TRUE) -$(eval $(call gb_Executable_use_static_libraries,gengal,\ - glxtest \ -)) -endif -endif -endif - $(eval $(call gb_Executable_add_default_nativeres,gengal)) # vim: set noet sw=4 ts=4: |