[PD-cvs] pd/src SConscript,1.1.4.50,1.1.4.51

[Thomas Grill]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10175/src

Modified Files:
      Tag: devel_0_39
	SConscript 
Log Message:
finally switching over to portaudio SVN

Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.50
retrieving revision 1.1.4.51
diff -C2 -d -r1.1.4.50 -r1.1.4.51
*** SConscript	1 Aug 2006 13:25:26 -0000	1.1.4.50
--- SConscript	12 Aug 2006 09:48:55 -0000	1.1.4.51
***************
*** 296,300 ****
  papath = pdenv['portaudiopath']
  
! pa_common_sources = map(lambda x: papath+'/pa_common/' + x,
                          Split("""
                              pa_allocation.c
--- 296,300 ----
  papath = pdenv['portaudiopath']
  
! pa_common_sources = map(lambda x: papath+'/src/common/' + x,
                          Split("""
                              pa_allocation.c
***************
*** 343,354 ****
          sources += map(lambda x: papath+x,
              Split("""
!                                 /pa_asio/pa_asio.cpp
!                                 /pa_win/pa_win_hostapis.c
!                                 /pa_win/pa_win_util.c
!                                 /pa_win/pa_x86_plain_converters.c
!                                 /pa_win_ds/pa_win_ds.c
!                                 /pa_win_ds/dsound_wrapper.c
!                                 /pa_win_wmme/pa_win_wmme.c
!                                 /pa_win_wdmks/pa_win_wdmks.c
               """)
               )
--- 343,354 ----
          sources += map(lambda x: papath+x,
              Split("""
!                                 /src/hostapi/asio/pa_asio.cpp
!                                 /src/os/win/pa_win_hostapis.c
!                                 /src/os/win/pa_win_util.c
!                                 /src/os/win/pa_x86_plain_converters.c
!                                 /src/hostapi/dsound/pa_win_ds.c
!                                 /src/hostapi/dsound/dsound_wrapper.c
!                                 /src/hostapi/wmme/pa_win_wmme.c
!                                 /src/hostapi/wdmks/pa_win_wdmks.c
               """)
               )
***************
*** 388,397 ****
      pa_linux_sources = map(lambda x: papath+x,
                          Split("""
!                             /pa_unix/pa_unix_util.c
!                             /pa_unix/pa_unix_hostapis.c
!                             /pa_unix_oss/pa_unix_oss.c
                          """)
                          )
-     pa_linux_sources.append(papath+'/pa_linux_alsa/pa_linux_alsa.c')
      linux_sources = oss_sources + midi_sources
  
--- 388,397 ----
      pa_linux_sources = map(lambda x: papath+x,
                          Split("""
!                             /src/os/unix/pa_unix_util.c
!                             /src/os/unix/pa_unix_hostapis.c
!                             /src/hostapi/oss/pa_unix_oss.c
!                             /src/hostapi/alsa/pa_linux_alsa.c
                          """)
                          )
      linux_sources = oss_sources + midi_sources
  
***************
*** 443,449 ****
      pa_osx_sources = map(lambda x: papath + x,
                          Split("""
!                             /pa_mac_core/pa_mac_core.c
!                             /pa_mac/pa_mac_hostapis.c
!                             /pa_unix/pa_unix_util.c
                          """)
                          )
--- 443,451 ----
      pa_osx_sources = map(lambda x: papath + x,
                          Split("""
!                             /src/hostapi/coreaudio/pa_mac_core.c
!                             /src/hostapi/coreaudio/pa_mac_core_utilities.c
!                             /src/hostapi/coreaudio/pa_mac_core_blocking.c
!                             /src/os/mac_osx/pa_mac_hostapis.c
!                             /src/os/unix/pa_unix_util.c
                          """)
                          )
***************
*** 460,463 ****
--- 462,468 ----
          osx_defs.append("USEAPI_JACK")
          pdenv.Append(LINKFLAGS=" -weak_framework Jack")
+         
+         osx_sources.append(papath+'/src/hostapi/jack/pa_jack.c')
+ 
  
      sources.append(osx_sources)
***************
*** 486,490 ****
  if pdenv['portaudio']:
      pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO  PA19"))
!     pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pa_asio',papath+'/pablio'])
  
  ######################################################################
--- 491,495 ----
  if pdenv['portaudio']:
      pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO  PA19"))
!     pdenv.Append(CPPPATH=[papath+'/include',papath+'/src/common'])
  
  ######################################################################
***************
*** 526,530 ****
          cflags += " /Ox"
      else:
!         if pdenv['PLATFORM'] != 'darwin':
              cflags += " -O3"
          else:
--- 531,535 ----
          cflags += " /Ox"
      else:
!         if True or pdenv['PLATFORM'] != 'darwin':
              cflags += " -O3"
          else: