diff options
| author | Matthew Waters <matthew@centricular.com> | 2018-10-17 10:13:59 +1100 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2018-10-17 10:13:59 +1100 |
| commit | c8a2098f756de94301fde16b9eec3dce566dc3ff (patch) | |
| tree | 29661618b91ac09e5c2ce9305945a77dac9076c0 | |
| parent | 475cb37ffd969cd4d912fac35e36644a0ee37986 (diff) | |
| download | gdk-pixbuf-c8a2098f756de94301fde16b9eec3dce566dc3ff.tar.gz | |
build: add enum generation header to sources of built libraries
This ensures that the enums are generated before compiling the headers.
Fixes variations on this error for different loaders
pixbuf@@staticpixbufloader-qtif@sta/io-qtif.c.o' -c ../gdk-pixbuf/io-qtif.c
In file included from ../gdk-pixbuf/io-qtif.c:34:0:
../gdk-pixbuf/gdk-pixbuf.h:40:46: fatal error: gdk-pixbuf/gdk-pixbuf-enum-types.h: No such file or directory
| -rw-r--r-- | gdk-pixbuf/meson.build | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build index 41323b2d4..430823028 100644 --- a/gdk-pixbuf/meson.build +++ b/gdk-pixbuf/meson.build @@ -125,6 +125,7 @@ foreach l: loaders mod = static_library('staticpixbufloader-@0@'.format(name), sources, + gdkpixbuf_enum_h, dependencies: loaders_deps + gdk_pixbuf_deps, include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags + cflags + cflag_for_included_loader) @@ -149,6 +150,7 @@ if native_windows_loaders mod = static_library('staticpixbufloader-gdiplus', win_loader_sources, + gdkpixbuf_enum_h, dependencies: loaders_deps + gdk_pixbuf_deps, include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags + cflag_for_included_loader) @@ -253,6 +255,7 @@ foreach l: loaders if cond and not (builtin_loaders.contains(name) or builtin_all_loaders) mod = shared_module('pixbufloader-@0@'.format(name), sources, + gdkpixbuf_enum_h, dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ], include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags + cflags, @@ -274,6 +277,7 @@ if native_windows_loaders mod = shared_module('pixbufloader-gdip-@0@'.format(loader), loader_sources, + gdkpixbuf_enum_h, dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ], include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags + cflags, @@ -296,6 +300,7 @@ foreach bin: gdkpixbuf_bin bin_source = bin.get(1, bin_name + '.c') bin = executable(bin_name, bin_source, + gdkpixbuf_enum_h, dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], include_directories: [ root_inc, gdk_pixbuf_inc ], c_args: common_cflags + gdk_pixbuf_cflags, |