Commit dbded013 authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

pass FLEXT_USE_CMEM to pkg-config

so externals get build with the same allocators as libflext
parent ec5dd766
...@@ -147,6 +147,7 @@ fi ...@@ -147,6 +147,7 @@ fi
OPT_FLAGS="$C_FLAGS -O2" OPT_FLAGS="$C_FLAGS -O2"
DBG_FLAGS="$C_FLAGS -DFLEXT_DEBUG -g" DBG_FLAGS="$C_FLAGS -DFLEXT_DEBUG -g"
FLEXT_EXT_CFLAGS=""
AC_ARG_ENABLE(optimize, AC_ARG_ENABLE(optimize,
AC_HELP_STRING(--enable-optimize,[enables optimized architecture specific builds for pentium4, pentium3, G4, G5, etc.]), AC_HELP_STRING(--enable-optimize,[enables optimized architecture specific builds for pentium4, pentium3, G4, G5, etc.]),
...@@ -173,7 +174,9 @@ AC_ARG_ENABLE(optimize, ...@@ -173,7 +174,9 @@ AC_ARG_ENABLE(optimize,
) )
AC_ARG_ENABLE([cmem], AC_ARG_ENABLE([cmem],
AC_HELP_STRING(--enable-cmem,[enables C-style memory allocation (as opposed to overloading 'new' and 'delete')]), AC_HELP_STRING(--enable-cmem,[enables C-style memory allocation (as opposed to overloading 'new' and 'delete')]),
AS_CASE([$enableval], [yes], [AC_DEFINE(FLEXT_USE_CMEM)])) AS_CASE([$enableval], [yes], [
AC_DEFINE(FLEXT_USE_CMEM)
FLEXT_EXT_CFLAGS="$(FLEXT_EXT_CFLAGS) -DFLEXT_USE_CMEM"]))
AC_SUBST(SYSTEM) AC_SUBST(SYSTEM)
...@@ -187,10 +190,12 @@ AC_SUBST(libs) ...@@ -187,10 +190,12 @@ AC_SUBST(libs)
AC_SUBST(stkdir) AC_SUBST(stkdir)
AC_SUBST(sndobjdir) AC_SUBST(sndobjdir)
AC_SUBST(FRAMEWORKS) AC_SUBST(FRAMEWORKS)
AC_SUBST(FLEXT_EXT_CFLAGS)
AC_OUTPUT([ AC_OUTPUT([
Makefile Makefile
source/Makefile source/Makefile
tutorial/simple1/Makefile
$SYSTEM-flext.pc $SYSTEM-flext.pc
]) ])
......
...@@ -6,7 +6,7 @@ includedir=@includedir@/flext ...@@ -6,7 +6,7 @@ includedir=@includedir@/flext
Name: pd-flext Name: pd-flext
Description: C++ glue layer for Pure Data and Max Description: C++ glue layer for Pure Data and Max
Version: @VERSION@ Version: @VERSION@
Cflags: -I${includedir} -DPD -DFLEXT_SYS=2 -DFLEXT_SHARED Cflags: -I${includedir} -DPD -DFLEXT_SYS=2 -DFLEXT_SHARED @FLEXT_EXT_CFLAGS@
Libs: -L${libdir} -lflext-pd Libs: -L${libdir} -lflext-pd
## sections below ought to be factored out into standalone .pc files ## sections below ought to be factored out into standalone .pc files
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment