diff options
Diffstat (limited to 'onlineupdate')
| -rw-r--r-- | onlineupdate/Executable_test_updater_dialog.mk | 8 | ||||
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 9 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/progressui_gtk.cxx | 10 |
3 files changed, 15 insertions, 12 deletions
diff --git a/onlineupdate/Executable_test_updater_dialog.mk b/onlineupdate/Executable_test_updater_dialog.mk index bd144c8bca18..a2988d0079d6 100644 --- a/onlineupdate/Executable_test_updater_dialog.mk +++ b/onlineupdate/Executable_test_updater_dialog.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Executable_set_include,test_updater_dialog,\ -I$(SRCDIR)/onlineupdate/source/update/updater/xpcom/glue \ -I$(SRCDIR)/onlineupdate/source/update/updater \ $$(INCLUDE) \ + $(if $(filter-out WNT,$(OS)),$$(GTK3_CFLAGS) ) \ )) $(eval $(call gb_Executable_use_static_libraries,test_updater_dialog,\ @@ -48,15 +49,10 @@ $(eval $(call gb_Executable_add_defs,test_updater_dialog,\ $(eval $(call gb_Executable_use_externals,test_updater_dialog,\ nss3 \ - gtk \ )) $(eval $(call gb_Executable_add_libs,test_updater_dialog,\ - -lX11 \ - -lXext \ - -lXrender \ - -lSM \ - -lICE \ + $(GTK3_LIBS) \ )) endif 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,\ diff --git a/onlineupdate/source/update/updater/progressui_gtk.cxx b/onlineupdate/source/update/updater/progressui_gtk.cxx index 47d27ea02c17..7c3bcfcd8b2d 100644 --- a/onlineupdate/source/update/updater/progressui_gtk.cxx +++ b/onlineupdate/source/update/updater/progressui_gtk.cxx @@ -14,6 +14,11 @@ #include <string.h> #include "progressui_gtk_icon.h" +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #define TIMER_INTERVAL 100 static float sProgressVal; // between 0 and 100 @@ -133,4 +138,9 @@ UpdateProgressUI(float progress) { sProgressVal = progress; // 32-bit writes are atomic } + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + #endif // defined(UNIX) || defined(MACOSX) |