Changeset 1360

Show
Ignore:
Timestamp:
02/23/08 14:10:38 (6 months ago)
Author:
jpgrayson
Message:

Fix (or at least make less grossly broken) asio build for Mac and Windows.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • portaudio/branches/v19-devel/configure.in

    r1358 r1360  
    185185            echo "ASIODIR: $ASIODIR" 
    186186 
    187             OTHER_OBJS="$CFLAGS pa_asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o" 
    188             CFLAGS="$CFLAGS -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/mac -I$ASIODIR/common" 
     187            OTHER_OBJS="src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/host/asiodrivers.o $ASIODIR/common/asio.o $ASIODIR/host/mac/asioshlib.o" 
     188            CFLAGS="$CFLAGS -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/mac -I$ASIODIR/common" 
    189189            CXXFLAGS="$CFLAGS" 
    190190        fi 
    … …  
    219219            echo "ASIODIR: $ASIODIR" 
    220220 
    221             OTHER_OBJS="pa_asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o pa_asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o" 
     221 
     222            OTHER_OBJS="src/hostapi/asio/pa_asio.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/hostapi/asio/iasiothiscallresolver.o $ASIODIR/common/asio.o $ASIODIR/host/asiodrivers.o $ASIODIR/host/pc/asiolist.o" 
    222223            LIBS="-lwinmm -lm -lstdc++ -lole32 -luuid" 
    223224            PADLL="portaudio.dll" 
    … …  
    225226            SHARED_FLAGS="-shared" 
    226227            DLL_LIBS="${DLL_LIBS} -lwinmm -lm -lstdc++ -lole32 -luuid" 
    227             CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/pa_asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS" 
     228            CFLAGS="$CFLAGS -ffast-math -fomit-frame-pointer -I\$(top_srcdir)/src/common -I\$(top_srcdir)/src/hostapi/asio -I$ASIODIR/host/pc -I$ASIODIR/common -I$ASIODIR/host -DPA_NO_WMME -DPA_NO_DS -DPA_NO_WDMKS -DWINDOWS" 
    228229            CXXFLAGS="$CFLAGS" 
    229230        elif [[ $with_winapi = "wdmks" ]] ; then