Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2382/src
Modified Files: Tag: devel_0_39 SConscript Log Message: portmidi support for Windows
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.56 retrieving revision 1.1.4.57 diff -C2 -d -r1.1.4.56 -r1.1.4.57 *** SConscript 13 Nov 2006 00:05:44 -0000 1.1.4.56 --- SConscript 14 Nov 2006 21:43:11 -0000 1.1.4.57 *************** *** 18,21 **** --- 18,22 ---- BoolOption('portaudio', 'Build with portaudio', True), ('portaudiopath', 'Path to portaudio','../portaudio'), + BoolOption('portmidi', 'Build with portmidi', True), ('portmidipath', 'Path to portmidi','../portmidi_osx'), BoolOption('threadedsf', 'Build with threaded soundfiler', False), *************** *** 312,315 **** --- 313,330 ---- ###################################################################### # + # portaudio stuff + + pmpath = pdenv['portmidipath'] + + pm_common_sources = map(lambda x: pmpath+x, + Split(""" + /pm_common/pmutil.c + /pm_common/portmidi.c + /porttime/porttime.c + """) + ) + + ###################################################################### + # # windows configuration
*************** *** 329,338 **** pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32"))
! sources += Split("s_midi_mmio.c") ! ! # PD wants to have MMIO in any case ! pdenv.Append(CPPDEFINES="USEAPI_MMIO") ! sources += Split("s_audio_mmio.c")
if pdenv['portaudio']: pdenv.Append(CPPDEFINES="USEAPI_PORTAUDIO") --- 344,362 ---- pdenv.Append(LIBS=Split("user32 ole32 winmm wsock32 advapi32"))
! if pdenv['portmidi']: ! pmpath = pdenv['portmidipath'] ! sources += pm_sources+pm_common_sources ! sources += map(lambda x: pmpath + x, ! Split(""" ! /pm_win/pmwin.c ! /pm_win/pmwinmm.c ! /porttime/ptwinmm.c ! """) ! ) ! pdenv.Append(CPPPATH=[pmpath,pmpath+'/pm_common',pmpath+'/porttime',pmpath+"/pm_win"]) ! else: ! sources += Split("s_midi_mmio.c")
+ if pdenv['portaudio']: pdenv.Append(CPPDEFINES="USEAPI_PORTAUDIO") *************** *** 352,355 **** --- 376,383 ---- ) pdenv.Append(LIBS="SetupApi") + else: + pdenv.Append(CPPDEFINES="USEAPI_MMIO") + sources += Split("s_audio_mmio.c") +
if pdenv['asio'] or pdenv['portaudio']: *************** *** 439,445 **** /pm_mac/pmmac.c /pm_mac/pmmacosxcm.c - /pm_common/pmutil.c - /pm_common/portmidi.c - /porttime/porttime.c /porttime/ptmacosx_cf.c """) --- 467,470 ---- *************** *** 454,458 **** """) ) ! osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources
osx_defs = Split("UNISTD PA_USE_COREAUDIO MACOSX") --- 479,483 ---- """) ) ! osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_common_sources + pm_osx_sources + simd_ve_gcc_sources
osx_defs = Split("UNISTD PA_USE_COREAUDIO MACOSX")