[gimp/gimp-2-8] plug-ins: mkgen.pl: fix calls to write_file() routine



commit f2249f1201242e082fc4c030faf05b9f42ea4878
Author: Kristian Rietveld <kris loopnest org>
Date:   Wed Sep 7 22:36:25 2016 +0200

    plug-ins: mkgen.pl: fix calls to write_file() routine
    
    So files get written in the current directory instead of the root
    directory.
    
    (cherry picked from commit f8ddfbe8cba4616d5e65244a4dd1bdb57a375240)

 plug-ins/common/mkgen.pl       |    9 +++++++++
 plug-ins/common/plugin-defs.pl |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index 5a25283..4d4bc38 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -176,6 +176,15 @@ ${makename}_CFLAGS = $cflagsvalue
 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)";
     if (exists $plugins{$_}->{libdep}) {
        my @lib = split(/:/, $plugins{$_}->{libdep});
diff --git a/plug-ins/common/plugin-defs.pl b/plug-ins/common/plugin-defs.pl
index d1e0356..df5d291 100644
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@ -140,7 +140,7 @@
     'video' => { ui => 1 },
     'warp' => { ui => 1 },
     'waves' => { 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' },
     'whirl-pinch' => { ui => 1 },
     'wind' => { ui => 1 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]