Include tooltip for Filter combo

[geeqie.git] / src / meson.build

diff --git a/src/meson.build b/src/meson.build
index 83ae2fa..3fecfb7 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,6 +13,7 @@
 
 main_sources = files('advanced-exif.cc',
 'advanced-exif.h',
+'backward.h',
 'bar.cc',
 'bar-comment.cc',
 'bar-comment.h',
@@ -123,8 +124,6 @@ main_sources = files('advanced-exif.cc',
 'image-load-svgz.h',
 'image-load-tiff.cc',
 'image-load-tiff.h',
-'image-load-webp.cc',
-'image-load-webp.h',
 'image-load-zxscr.cc',
 'image-load-zxscr.h',
 'image-overlay.cc',
@@ -209,8 +208,6 @@ main_sources = files('advanced-exif.cc',
 'ui-misc.h',
 'ui-pathsel.cc',
 'ui-pathsel.h',
-'ui-spinner.cc',
-'ui-spinner.h',
 'ui-tabcomp.cc',
 'ui-tabcomp.h',
 'ui-tree-edit.cc',
@@ -237,27 +234,27 @@ main_sources = files('advanced-exif.cc',
 
 project_sources += main_sources
 
+subdir('authors')
 subdir('icons')
 subdir('pan-view')
+subdir('ui')
 subdir('view-file')
 
-gqmarshal = gnome.genmarshal('gq-marshal', prefix : 'gq_marshal', sources : 'gq-marshal.list')
-project_sources += gqmarshal[0]
-project_sources += gqmarshal[1]
+gq_marshal = gnome.genmarshal('gq-marshal', prefix : 'gq_marshal', sources : 'gq-marshal.list')
 
-icon_pairs = [
-'icon_spinner', files('ui_spinner.png'),
-'icon_tabcomp', files('ui_tabcomp.png'),
-]
+project_sources += gq_marshal[1]
 
-ui_icons_h = custom_target('ui_icons', output : 'ui_icons.h',
-                command : [gdk_pixbuf_csource, '--raw', '--extern', '--build-list', icon_pairs],
-                capture : true)
+gq_marshal_pragma_sh = find_program('gq-marshal-pragma.sh', dirs : scriptsdir)
 
-project_sources += ui_icons_h
+gq_marshal_pragma = custom_target('gq-marshal-pragma',
+                    input : gq_marshal[0],
+                    output : 'gq-marshal-pragma.c',
+                    command : [gq_marshal_pragma_sh, '@INPUT@', '@OUTPUT@'])
+
+project_sources += gq_marshal_pragma
 
 if conf_data.has('HAVE_LCMS')
-    xxd_sh = find_program('generate-ClayRGB1998-icc-h.sh', dirs : join_paths(meson.source_root(), 'scripts'))
+    xxd_sh = find_program('generate-ClayRGB1998-icc-h.sh', dirs : join_paths(meson.project_source_root(), 'scripts'))
 
     ClayRGB1998_icc_h = custom_target('ClayRGB1998',
                         input: 'ClayRGB1998.icc',
@@ -267,7 +264,7 @@ if conf_data.has('HAVE_LCMS')
     project_sources += ClayRGB1998_icc_h
 endif
 
-executable('geeqie', project_sources,
+geeqie_exe = executable('geeqie', project_sources,
 dependencies : [
 gtk_dep,
 champlain_dep,
@@ -280,13 +277,15 @@ glib_dep,
 gspell_dep,
 lcms_dep,
 libarchive_dep,
+libdw_dep,
+libexecinfo_dep,
 libffmpegthumbnailer_dep,
 libheif_dep,
 libjpeg_dep,
 libjxl_dep,
 libopenjp2_dep,
 libraw_dep,
-libwebp_dep,
+libunwind_dep,
 lua_dep,
 poppler_glib_dep,
 thread_dep,