[gimp/meson: 5/9] include .c ?? That's just weird and just can't work.
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 5/9] include .c ?? That's just weird and just can't work.
- Date: Fri, 16 Feb 2018 13:56:35 +0000 (UTC)
commit 33a88938a71d1e49c6d88cd0e493d431b9eecd79
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 ++++
libgimpwidgets/gimpicons.c | 4 ++++
meson.build | 1 +
plug-ins/pagecurl/pagecurl.c | 5 ++++-
4 files changed, 13 insertions(+), 1 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/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/meson.build b/meson.build
index a1d81e2..d4dd42c 100644
--- a/meson.build
+++ b/meson.build
@@ -1156,6 +1156,7 @@ config_defines = [
'-DISO_CODES_LOCALEDIR=' +'"'+ isocodes_localedir +'"',
'-DHAVE_CONFIG_H',
+ '-DMESON_BUILD',
]
add_project_arguments(
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index d1c3cd2..e08c4b4 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -47,8 +47,11 @@
#include "libgimp/stdplugins-intl.h"
+#ifdef MESON_BUILD
+#include "pagecurl-icons.h"
+#else
#include "pagecurl-icons.c"
-
+#endif
#define PLUG_IN_PROC "plug-in-pagecurl"
#define PLUG_IN_BINARY "pagecurl"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]