[gimp] app: fix the build on OSX
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: fix the build on OSX
- Date: Mon, 7 May 2012 21:06:08 +0000 (UTC)
commit e30d5512e2ba987d276c1a3c07c94d6fc27bbeaa
Author: Michael Natterer <mitch gimp org>
Date: Mon May 7 23:04:59 2012 +0200
app: fix the build on OSX
app/Makefile.am | 9 +++++----
app/plug-in/gimppluginshm.c | 6 ++++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 982be04..ed714bf 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -139,9 +139,7 @@ calm_down_linker = \
-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-u $(SYMPREFIX)gimp_curve_map_pixels \
- -u $(SYMPREFIX)gimp_cairo_image_surface_create_buffer \
- -u $(SYMPREFIX)gimp_param_spec_duplicate \
- -u $(SYMPREFIX)gimp_lebl_dialog
+ -u $(SYMPREFIX)gimp_param_spec_duplicate
AM_LDFLAGS = \
$(munix) \
@@ -183,7 +181,10 @@ gimpconsoleldadd = \
$(INTLLIBS) \
$(RT_LIBS)
-gimp_ GIMP_APP_VERSION@_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags)
+gimp_ GIMP_APP_VERSION@_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ $(win32_ldflags) \
+ -u $(SYMPREFIX)gimp_lebl_dialog
gimp_ GIMP_APP_VERSION@_LDADD = \
gui/libappgui.a \
diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c
index ca35674..b854ff5 100644
--- a/app/plug-in/gimppluginshm.c
+++ b/app/plug-in/gimppluginshm.c
@@ -44,7 +44,7 @@
#endif /* USE_POSIX_SHM */
-#include <glib-object.h>
+#include <gegl.h>
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
@@ -63,6 +63,8 @@
#include "plug-in-types.h"
+#include "core/gimp-utils.h"
+
#include "gimppluginshm.h"
#include "gimp-log.h"
@@ -179,7 +181,7 @@ gimp_plug_in_shm_new (void)
gint shm_fd;
/* Our shared memory id will be our process ID */
- pid = get_pid ();
+ pid = gimp_get_pid ();
/* From the id, derive the file map name */
g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d", pid);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]