diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-13 10:37:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-30 16:53:32 +0200 |
| commit | 1ae450504cf57457f9702684b1517fda1dd3c481 (patch) | |
| tree | 2b1fc3870594dcc01217e3e406322ab084e258ef /onlineupdate/Executable_updater.mk | |
| parent | 25ca657f8d0f1febaf0d5984bc862f3072ad197b (diff) | |
drop gtk2 support
Change-Id: Ie838cabfecfef7e3225c1555536d5c9cf3b43f15
Reviewed-on: https://gerrit.libreoffice.org/77405
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'onlineupdate/Executable_updater.mk')
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index 7c24b7beb3bb..ab15a94e4c60 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -14,6 +14,7 @@ $(eval $(call gb_Executable_set_include,updater,\ -I$(SRCDIR)/onlineupdate/source/update/common \ -I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \ $$(INCLUDE) \ + $(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \ )) $(eval $(call gb_Executable_use_custom_headers,updater,onlineupdate/generated)) @@ -61,16 +62,12 @@ $(eval $(call gb_Executable_add_defs,updater,\ $(eval $(call gb_Executable_use_externals,updater,\ nss3 \ - gtk \ )) $(eval $(call gb_Executable_add_libs,updater,\ - -lX11 \ - -lXext \ - -lXrender \ - -lSM \ - -lICE \ + $(GTK3_LIBS) \ )) + endif $(eval $(call gb_Executable_add_exception_objects,updater,\ |