shmalloc: Manually decide to use GLib or not in the shmalloc

So make it easier for embedders to use it with or without Glib
This commit is contained in:
Olivier Crête 2010-10-23 01:12:49 +02:00
parent 01f1cc20d7
commit a770d7a707
2 changed files with 2 additions and 2 deletions

View file

@ -5,7 +5,7 @@ include $(top_srcdir)/common/glib-gen.mak
plugin_LTLIBRARIES = libgstshm.la plugin_LTLIBRARIES = libgstshm.la
libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c 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_LIBADD = -lrt
libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
libgstshm_la_LIBTOOLFLAGS = --tag=disable-static libgstshm_la_LIBTOOLFLAGS = --tag=disable-static

View file

@ -27,7 +27,7 @@
#ifndef __SHMALLOC_H__ #ifndef __SHMALLOC_H__
#define __SHMALLOC_H__ #define __SHMALLOC_H__
#ifdef GST_PACKAGE_NAME #ifdef SHM_PIPE_USE_GLIB
#include <glib.h> #include <glib.h>
#define spalloc_new(type) g_slice_new (type) #define spalloc_new(type) g_slice_new (type)