diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-17 13:47:17 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-12 07:14:32 +0000 |
| commit | 2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738 (patch) | |
| tree | 8b14d373b97ea9162a46e8b61f42919f2a6c5514 /ui/gtk/Makefile.nmake | |
| parent | 1ab019f409f2855d3b51717a237cc482242887e9 (diff) | |
[GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).
Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.
Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).
Add missing 'expert_ok.png' file to distribution (GTK only).
Minor improvements to style/structure of ui/gtk/Makefile.am.
Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/Makefile.nmake')
| -rw-r--r-- | ui/gtk/Makefile.nmake | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake index 5cf74c6042..93fef3dd8d 100644 --- a/ui/gtk/Makefile.nmake +++ b/ui/gtk/Makefile.nmake @@ -32,7 +32,8 @@ WIRESHARK_CLEAN_LIBGTKUI_SRC = \ $(WIRESHARK_GTK_SRC) \ $(WIRESHARK_TAP_SRC) \ $(GENERATED_C_FILES) \ - capture_if_details_dlg_win32.c + capture_if_details_dlg_win32.c \ + pixbuf-csource.c WIRESHARK_LIBGTKUI_SRC = \ $(WIRESHARK_CLEAN_LIBGTKUI_SRC) @@ -66,24 +67,6 @@ WIRESHARK_LIBGTKUI_OBJECTS = \ libgtkui.lib: ..\..\config.h $(WIRESHARK_LIBGTKUI_OBJECTS) link /lib /out:libgtkui.lib $(WIRESHARK_LIBGTKUI_OBJECTS) winmm.lib - -layouts.h: - echo /* This file was automatically generated. DO NOT EDIT. */ > $@ - echo. $@ - for %n in (1 2 3 4 5 6) do \ - gdk-pixbuf-csource --raw --name=layout_%n_pb_data ../../image/layout_%n.png >> $@ - -wsicon.h: - echo /* This file was automatically generated. DO NOT EDIT. */ > $@ - echo. $@ - for %n in (16 24 32 48 64) do \ - gdk-pixbuf-csource --raw --name=wsicon_%n_pb_data ../../image/wsicon%n.png >> $@ -wsiconcap.h: - echo /* This file was automatically generated. DO NOT EDIT. */ > $@ - echo. $@ - for %n in (16 24 32 48 64) do \ - gdk-pixbuf-csource --raw --name=wsiconcap_%n_pb_data ../../image/wsiconcap%n.png >> $@ - # The first argument is the directory in which the source files live. # The second argument is "taps", to indicate that we should build # a tap register file. |