Commit 936d5b86 authored by rossb's avatar rossb

fixed configure.in and makefile.in. attempt #2. fixes incorrect escapes in r1772

git-svn-id: https://subversion.assembla.com/svn/portaudio/portaudio/trunk@1781 0f58301d-fd10-0410-b4af-bbb618454e57
parent 9c8f6cd7
...@@ -18,8 +18,7 @@ libdir = @libdir@ ...@@ -18,8 +18,7 @@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
# note platform include directories are added to CFLAGS in configure.in CFLAGS = @CFLAGS@ @DEFS@
CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@
LIBS = @LIBS@ LIBS = @LIBS@
AR = @AR@ AR = @AR@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
......
...@@ -195,13 +195,16 @@ add_objects() ...@@ -195,13 +195,16 @@ add_objects()
INCLUDES=portaudio.h INCLUDES=portaudio.h
dnl Include directories needed by all implementations
CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/src/common"
case "${host_os}" in case "${host_os}" in
darwin* ) darwin* )
dnl Mac OS X configuration dnl Mac OS X configuration
AC_DEFINE(PA_USE_COREAUDIO,1) AC_DEFINE(PA_USE_COREAUDIO,1)
CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix -Werror" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Werror"
LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon" LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
if test "x$enable_mac_universal" = "xyes" ; then if test "x$enable_mac_universal" = "xyes" ; then
...@@ -296,7 +299,7 @@ case "${host_os}" in ...@@ -296,7 +299,7 @@ case "${host_os}" in
dnl Cygwin configuration dnl Cygwin configuration
OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o" OTHER_OBJS="src/hostapi/wmme/pa_win_wmme.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_waveformat.o"
CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix -DPA_USE_DS=0 -DPA_USE_WDMKS=0 -DPA_USE_ASIO=0 -DPA_USE_WASAPI=0 -DPA_USE_WMME=1" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/win -DPA_USE_DS=0 -DPA_USE_WDMKS=0 -DPA_USE_ASIO=0 -DPA_USE_WASAPI=0 -DPA_USE_WMME=1"
LIBS="-lwinmm -lm" LIBS="-lwinmm -lm"
PADLL="portaudio.dll" PADLL="portaudio.dll"
THREAD_CFLAGS="-mthreads" THREAD_CFLAGS="-mthreads"
...@@ -317,7 +320,7 @@ case "${host_os}" in ...@@ -317,7 +320,7 @@ case "${host_os}" in
dnl dnl
AC_DEFINE(PA_USE_SGI,1) AC_DEFINE(PA_USE_SGI,1)
CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm. dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm.
dnl dnl
...@@ -335,7 +338,7 @@ case "${host_os}" in ...@@ -335,7 +338,7 @@ case "${host_os}" in
*) *)
dnl Unix configuration dnl Unix configuration
CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix" CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"], AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
AC_MSG_ERROR([libpthread not found!])) AC_MSG_ERROR([libpthread not found!]))
......
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