[gimp/meson: 23/127] #include .c ?? That's just weird and just can't work.



commit 7868be15cf5cb68d941f84081feaed60c1a897c5
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Nov 16 17:25:53 2017 +0100

    #include .c ?? That's just weird and just can't work.

 app/core/gimpviewable.c    |    4 ++++
 app/core/meson.build       |    1 +
 libgimpwidgets/gimpicons.c |    4 ++++
 libgimpwidgets/meson.build |    1 +
 4 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index 678ccef..9d9c5ea 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -39,7 +39,11 @@
 #include "gimptempbuf.h"
 #include "gimpviewable.h"
 
+#ifdef MESON_BUILD
+#include "icons/Color/gimp-core-pixbufs.h"
+#else
 #include "icons/Color/gimp-core-pixbufs.c"
+#endif
 
 
 enum
diff --git a/app/core/meson.build b/app/core/meson.build
index 9b47814..39718fb 100644
--- a/app/core/meson.build
+++ b/app/core/meson.build
@@ -258,6 +258,7 @@ libappcore = static_library('appcore',
     '-DGIMPDIR="'+ gimpdir +'"',
     '-DGIMP_APP_VERSION="'+ app_version +'"',
     '-DGIMP_USER_VERSION="'+ user_version +'"',
+    '-DMESON_BUILD',
   ],
   dependencies: [
     cairo, gegl, gdk_pixbuf, libmypaint, gexiv2,
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 5ab3894..724e6cc 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -28,7 +28,11 @@
 #undef GIMP_DISABLE_DEPRECATED
 #include "gimpicons.h"
 
+#ifdef MESON_BUILD
+#include "icons/Color/gimp-icon-pixbufs.h"
+#else
 #include "icons/Color/gimp-icon-pixbufs.c"
+#endif
 
 #include "libgimp/libgimp-intl.h"
 
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index 23a6601..dd6ab0f 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -190,6 +190,7 @@ libgimpwidgets_headers = [
 libgimpwidgets_cflags = [
   '-DG_LOG_DOMAIN="LibGimpWidgets"',
   '-DGIMP_WIDGETS_COMPILATION',
+  '-DMESON_BUILD',
 ]
 
 libgimpwidgets_lflags = [


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