diff options
| author | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-10-23 01:12:49 +0200 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.co.uk> | 2010-11-24 19:12:10 -0500 |
| commit | a770d7a70760ad4bbdbad22d2902e65148570eef (patch) | |
| tree | 5ef0f08cde0278cb711573002372719d796bedf0 /sys/shm | |
| parent | 01f1cc20d7a5c665a175ffe7c61323ff3df04db8 (diff) | |
| download | gstreamer-plugins-bad-a770d7a70760ad4bbdbad22d2902e65148570eef.tar.gz | |
shmalloc: Manually decide to use GLib or not in the shmalloc
So make it easier for embedders to use it with or without Glib
Diffstat (limited to 'sys/shm')
| -rw-r--r-- | sys/shm/Makefile.am | 2 | ||||
| -rw-r--r-- | sys/shm/shmalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/shm/Makefile.am b/sys/shm/Makefile.am index fdc034b71..bfe7b49fe 100644 --- a/sys/shm/Makefile.am +++ b/sys/shm/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/common/glib-gen.mak plugin_LTLIBRARIES = libgstshm.la libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c -libgstshm_la_CFLAGS = $(GST_CFLAGS) +libgstshm_la_CFLAGS = $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB libgstshm_la_LIBADD = -lrt libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstshm_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/sys/shm/shmalloc.h b/sys/shm/shmalloc.h index d5aa581ef..c3d33656a 100644 --- a/sys/shm/shmalloc.h +++ b/sys/shm/shmalloc.h @@ -27,7 +27,7 @@ #ifndef __SHMALLOC_H__ #define __SHMALLOC_H__ -#ifdef GST_PACKAGE_NAME +#ifdef SHM_PIPE_USE_GLIB #include <glib.h> #define spalloc_new(type) g_slice_new (type) |