Browse Source

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

tags/pa_stable_v190600_20161030
rossb 7 years ago
parent
commit
a665b0928c
2 changed files with 8 additions and 6 deletions
  1. 1
    2
      Makefile.in
  2. 7
    4
      configure.in

+ 1
- 2
Makefile.in View File

@@ -18,8 +18,7 @@ libdir = @libdir@
18 18
 includedir = @includedir@
19 19
 CC = @CC@
20 20
 CXX = @CXX@
21
-# note platform include directories are added to CFLAGS in configure.in
22
-CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/common @CFLAGS@ @DEFS@
21
+CFLAGS = @CFLAGS@ @DEFS@
23 22
 LIBS = @LIBS@
24 23
 AR = @AR@
25 24
 RANLIB = @RANLIB@

+ 7
- 4
configure.in View File

@@ -195,13 +195,16 @@ add_objects()
195 195
 
196 196
 INCLUDES=portaudio.h
197 197
 
198
+dnl Include directories needed by all implementations
199
+CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/src/common"
200
+
198 201
 case "${host_os}" in
199 202
   darwin* )
200 203
         dnl Mac OS X configuration
201 204
 
202 205
         AC_DEFINE(PA_USE_COREAUDIO,1)
203 206
 
204
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix -Werror"
207
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Werror"
205 208
         LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
206 209
 
207 210
         if test "x$enable_mac_universal" = "xyes" ; then
@@ -296,7 +299,7 @@ case "${host_os}" in
296 299
         dnl Cygwin configuration
297 300
 
298 301
         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"
299
-        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"
302
+        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"
300 303
         LIBS="-lwinmm -lm"
301 304
         PADLL="portaudio.dll"
302 305
         THREAD_CFLAGS="-mthreads"
@@ -317,7 +320,7 @@ case "${host_os}" in
317 320
         dnl
318 321
         AC_DEFINE(PA_USE_SGI,1)
319 322
 
320
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix"
323
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
321 324
 
322 325
         dnl The _REENTRANT option for pthread safety. Perhaps not necessary but it 'll do no harm.
323 326
         dnl
@@ -335,7 +338,7 @@ case "${host_os}" in
335 338
   *)
336 339
         dnl Unix configuration
337 340
 
338
-        CFLAGS="$CFLAGS -I$(top_srcdir)/src/os/unix"
341
+        CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix"
339 342
         
340 343
         AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
341 344
                 AC_MSG_ERROR([libpthread not found!]))

Loading…
Cancel
Save