callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: fix the build on OSX

Browse Source
This commit is contained in:
Michael Natterer
2012-05-07 23:04:59 +02:00
parent 20f3cba2b6
commit e30d5512e2
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Makefile.am
View File

@ -139,9 +139,7 @@ calm_down_linker = \
-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \
-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \
-u $(SYMPREFIX)gimp_curve_map_pixels \ -u $(SYMPREFIX)gimp_curve_map_pixels \
-u $(SYMPREFIX)gimp_cairo_image_surface_create_buffer \ -u $(SYMPREFIX)gimp_param_spec_duplicate
-u $(SYMPREFIX)gimp_param_spec_duplicate \
-u $(SYMPREFIX)gimp_lebl_dialog
AM_LDFLAGS = \ AM_LDFLAGS = \
$(munix) \ $(munix) \
@ -183,7 +181,10 @@ gimpconsoleldadd = \
$(INTLLIBS) \ $(INTLLIBS) \
$(RT_LIBS) $(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 = \ gimp_@GIMP_APP_VERSION@_LDADD = \
gui/libappgui.a \ gui/libappgui.a \

6
app/plug-in/gimppluginshm.c
View File

@ -44,7 +44,7 @@
#endif /* USE_POSIX_SHM */ #endif /* USE_POSIX_SHM */
#include <glib-object.h> #include <gegl.h>
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN) #if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
@ -63,6 +63,8 @@
#include "plug-in-types.h" #include "plug-in-types.h"
#include "core/gimp-utils.h"
#include "gimppluginshm.h" #include "gimppluginshm.h"
#include "gimp-log.h" #include "gimp-log.h"
@ -179,7 +181,7 @@ gimp_plug_in_shm_new (void)
gint shm_fd; gint shm_fd;
/* Our shared memory id will be our process ID */ /* Our shared memory id will be our process ID */
pid = get_pid (); pid = gimp_get_pid ();
/* From the id, derive the file map name */ /* From the id, derive the file map name */
g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d", pid); g_snprintf (shm_handle, sizeof (shm_handle), "/gimp-shm-%d", pid);