pd/src SConscript,1.1.4.39,1.1.4.40 - Pd-cvs

5 Dec 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1197/src
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
updated for newer portmidi distributions (OSX)
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.39
retrieving revision 1.1.4.40
diff -C2 -d -r1.1.4.39 -r1.1.4.40
*** SConscript	4 Dec 2005 21:54:08 -0000	1.1.4.39
--- SConscript	5 Dec 2005 00:45:43 -0000	1.1.4.40
***************
*** 419,427 ****
    pm_osx_sources = map(lambda x: pmpath+x,
    					Split("""
! 							/pmdarwin.c
! 							/pmmacosx.c
! 							/pmutil.c
! 							/portmidi.c
! 							/ptdarwin.c
    					""")
    					)
--- 419,428 ----
    pm_osx_sources = map(lambda x: pmpath+x,
    					Split("""
! 							/pm_mac/pmmac.c
! 							/pm_mac/pmmacosxcm.c
! 							/pm_common/pmutil.c
! 							/pm_common/portmidi.c
! 							/porttime/porttime.c
! 							/porttime/ptmacosx_cf.c
    					""")
    					)
***************
*** 438,442 ****
sources.append(osx_sources)
! 	pdenv.Append(CPPPATH=pmpath)
    pdenv.Append(CPPDEFINES=osx_defs)
--- 439,443 ----
sources.append(osx_sources)
! 	pdenv.Append(CPPPATH=pmpath+"/pm_mac")
    pdenv.Append(CPPDEFINES=osx_defs)
***************
*** 463,467 ****
--- 464,473 ----
    pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pablio'])
+ ######################################################################
+ #
+ # portmidi stuff
+ if pdenv['portmidipath']:
+ 	pdenv.Append(CPPPATH=[pmpath+'/pm_common',pmpath+'/porttime'])
######################################################################