[PD-cvs] pd/src SConscript,1.1.4.40,1.1.4.41

[Thomas Grill]

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

Modified Files:
      Tag: devel_0_39
	SConscript 
Log Message:
fix portmidi for non-OSX
WIN32: new pthreads layout

Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.40
retrieving revision 1.1.4.41
diff -C2 -d -r1.1.4.40 -r1.1.4.41
*** SConscript	5 Dec 2005 00:45:43 -0000	1.1.4.40
--- SConscript	5 Dec 2005 13:12:11 -0000	1.1.4.41
***************
*** 135,140 ****
  		Exit(1)
  	
! 	pdenv.Append(CPPPATH=[path_pthread,path_tcl+'/include'])
! 	pdenv.Append(LIBPATH=[path_pthread,path_tcl+'/lib'])
  	
  	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc'])
--- 135,140 ----
  		Exit(1)
  	
! 	pdenv.Append(CPPPATH=[path_pthread+'/include',path_tcl+'/include'])
! 	pdenv.Append(LIBPATH=[path_pthread+'/lib',path_tcl+'/lib'])
  	
  	pdenv.Append(CPPPATH=[path_asio+'/common',path_asio+'/host',path_asio+'/host/pc'])
***************
*** 143,147 ****
  	sep = ""
  	if 'msvc' in pdenv['TOOLS']:
! 		pthreadLib = "pthreadVC"
  	else:
  		pthreadLib = "pthreadGC2"
--- 143,147 ----
  	sep = ""
  	if 'msvc' in pdenv['TOOLS']:
! 		pthreadLib = "pthreadVC2"
  	else:
  		pthreadLib = "pthreadGC2"
***************
*** 439,443 ****
  
  	sources.append(osx_sources)
! 	pdenv.Append(CPPPATH=pmpath+"/pm_mac")
  	pdenv.Append(CPPDEFINES=osx_defs)
  
--- 439,443 ----
  
  	sources.append(osx_sources)
! 	pdenv.Append(CPPPATH=[pmpath+'/pm_common',pmpath+'/porttime',pmpath+"/pm_mac"])
  	pdenv.Append(CPPDEFINES=osx_defs)
  
***************
*** 466,476 ****
  ######################################################################
  #
- # portmidi stuff
- 
- if pdenv['portmidipath']:
- 	pdenv.Append(CPPPATH=[pmpath+'/pm_common',pmpath+'/porttime'])
- 
- ######################################################################
- #
  # compiler options
  flags = ''
--- 466,469 ----