Commit 291e41d0 authored by Thomas Grill's avatar Thomas Grill Committed by GitHub
Browse files

Merge pull request #25 from grrrr/umlaeute-autotools

Updates to pull request #24
parents 01318a94 93570389
......@@ -7,7 +7,7 @@
# API_VERSION=0:0:0
AC_INIT([flext],[0.6.0],[gr@grrrr.org])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_MACRO_DIRS([m4])
# TODO: this should definitely be changed to work with any version of CYGWIN_NT or MINGW32_NT
......@@ -93,7 +93,7 @@ AC_ARG_WITH(sndobjdir,
[
AC_CHECK_FILE([$withval/SndObj.h],,AC_MSG_ERROR([Cannot find $withval/SndObj.h]))
sndobjdir=$withval
INCLUDEDIRS="$INCLDUEDIRS $withval"
INCLUDEDIRS="$INCLUDEDIRS $withval"
]
)
......@@ -147,6 +147,7 @@ fi
OPT_FLAGS="$C_FLAGS -O2"
DBG_FLAGS="$C_FLAGS -DFLEXT_DEBUG -g"
FLEXT_EXT_CFLAGS=""
AC_ARG_ENABLE(optimize,
AC_HELP_STRING(--enable-optimize,[enables optimized architecture specific builds for pentium4, pentium3, G4, G5, etc.]),
......@@ -171,6 +172,11 @@ AC_ARG_ENABLE(optimize,
esac
]
)
AC_ARG_ENABLE([cmem],
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)
FLEXT_EXT_CFLAGS="$FLEXT_EXT_CFLAGS -DFLEXT_USE_CMEM"]))
AC_SUBST(SYSTEM)
......@@ -184,10 +190,12 @@ AC_SUBST(libs)
AC_SUBST(stkdir)
AC_SUBST(sndobjdir)
AC_SUBST(FRAMEWORKS)
AC_SUBST(FLEXT_EXT_CFLAGS)
AC_OUTPUT([
Makefile
source/Makefile
tutorial/simple1/Makefile
$SYSTEM-flext.pc
])
......
......@@ -6,7 +6,7 @@ includedir=@includedir@/flext
Name: pd-flext
Description: C++ glue layer for Pure Data and Max
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
## sections below ought to be factored out into standalone .pc files
......
......@@ -73,10 +73,10 @@ nobase_pkginclude_HEADERS = \
# handling for stk / sndobj
SRCS_STK = flstk.cpp
HDRS_STK = flstk.cpp
HDRS_STK = flstk.h
SRCS_SNDOBJ = flsndobj.cpp
HDRS_SNDOBJ = flsndobj.cpp
HDRS_SNDOBJ = flsndobj.h
if SNDOBJ
SRCS_FLEXT += $(SRCS_SNDOBJ)
......@@ -101,8 +101,8 @@ libflext_@SYSTEM@_s_la_CXXFLAGS = @OPT_FLAGS@ -static $(patsubst %,-I%,@INCLU
libflext_@SYSTEM@_sd_la_CXXFLAGS = @DBG_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@)
libflext_@SYSTEM@_t_la_CXXFLAGS = @OPT_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_td_la_CXXFLAGS = @DBG_FLAGS@ -static $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_THREADS
libflext_@SYSTEM@_la_CXXFLAGS = @OPT_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED
libflext_@SYSTEM@_d_la_CXXFLAGS = @DBG_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED
libflext_@SYSTEM@_la_CXXFLAGS = @OPT_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED -DFLEXT_EXPORTS
libflext_@SYSTEM@_d_la_CXXFLAGS = @DBG_FLAGS@ $(patsubst %,-I%,@INCLUDEDIRS@) -DFLEXT_SHARED -DFLEXT_EXPORTS
libflext_@SYSTEM@_la_LDFLAGS = @LD_FLAGS@ $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
libflext_@SYSTEM@_d_la_LDFLAGS = @LD_FLAGS@ $(patsubst %,-L%,@LIBDIRS@) $(patsubst %,-l%,@libs@ $(LIB_SNDOBJ) $(LIB_STK)) $(patsubst %,-framework %,@FRAMEWORKS@)
......
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