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

plug-ins: common: fix scripts to generate Makefile.am correctly 

This complements the preceding commit "plug-ins: fix the build on OS X".
This commit is contained in:
Kristian Rietveld 2016-09-07 22:05:09 +02:00
parent f4f7b894ed
commit b462418dfc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,15 @@ ${makename}_CFLAGS = $cflagsvalue
EOT EOT
} }
if (exists $plugins{$_}->{cppflags}) {
my $cppflags = $plugins{$_}->{cppflags};
print MK <<EOT;
${makename}_CPPFLAGS = $cppflags
EOT
}
my $deplib = "\$(RT_LIBS)\t\t\\\n\t\$(INTLLIBS)"; my $deplib = "\$(RT_LIBS)\t\t\\\n\t\$(INTLLIBS)";
if (exists $plugins{$_}->{libdep}) { if (exists $plugins{$_}->{libdep}) {
my @lib = split(/:/, $plugins{$_}->{libdep}); my @lib = split(/:/, $plugins{$_}->{libdep});

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

@ -90,6 +90,6 @@
'unsharp-mask' => { ui => 1 }, 'unsharp-mask' => { ui => 1 },
'van-gogh-lic' => { ui => 1 }, 'van-gogh-lic' => { ui => 1 },
'warp' => { ui => 1 }, 'warp' => { ui => 1 },
'web-browser' => { ui => 1, ldflags => '$(framework_cocoa)', cflags => '$(xobjective_c)' }, 'web-browser' => { ui => 1, ldflags => '$(framework_cocoa)', cppflags => '$(AM_CPPFLAGS) $(xobjective_c)' },
'web-page' => { ui => 1, optional => 1, libs => 'WEBKIT_LIBS', cflags => 'WEBKIT_CFLAGS' } 'web-page' => { ui => 1, optional => 1, libs => 'WEBKIT_LIBS', cflags => 'WEBKIT_CFLAGS' }
); );