dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: link file-compressor against GIO 

mkgen.pl: add support for "gio => 1" in plug-in-desf.pl,

Regenerate Makefile.am
This commit is contained in:
Michael Natterer 2016-06-05 22:08:49 +02:00
parent 7b9a7439dc
commit 372a985d2b
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plug-ins/common/Makefile.am
View File

@ -637,6 +637,7 @@ file_compressor_LDADD = \
$(libgimpbase) \
$(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
$(GIO_LIBS) \
$(LZMA_LIBS) \
$(BZIP2_LIBS) \
$(Z_LIBS) \

9
plug-ins/common/mkgen.pl
View File

@ -141,9 +141,14 @@ foreach (sort keys %plugins) {
my $glib;
if (exists $plugins{$_}->{ui}) {
$glib = "\$(GTK_LIBS)\t\t\\"
$glib = "\$(GTK_LIBS)\t\t\\";
} else {
$glib = "\$(CAIRO_LIBS)\t\t\\\n\t\$(GDK_PIXBUF_LIBS)\t\\"
$glib = "\$(CAIRO_LIBS)\t\t\\\n\t\$(GDK_PIXBUF_LIBS)\t\\";
if (exists $plugins{$_}->{gio} &&
! exists $plugins{$_}->{gegl}) {
$glib .= "\n\t\$(GIO_LIBS)\t\t\\";
}
}
if (exists $plugins{$_}->{gegl}) {

2
plug-ins/common/plugin-defs.pl
View File

@ -27,7 +27,7 @@
'file-aa' => { ui => 1, gegl => 1, optional => 1, libs => 'AA_LIBS' },
'file-cel' => { ui => 1, gegl => 1 },
'file-csource' => { ui => 1, gegl => 1 },
'file-compressor' => { libdep => 'Z:BZIP2:LZMA', cflags => 'LZMA_CFLAGS' },
'file-compressor' => { gio => 1, libdep => 'Z:BZIP2:LZMA', cflags => 'LZMA_CFLAGS' },
'file-desktop-link' => {},
'file-dicom' => { ui => 1, gegl => 1, cflags => '-fno-strict-aliasing' },
'file-gbr' => { ui => 1, gegl => 1 },