pd/src SConscript,1.1.4.35,1.1.4.36 - Pd-cvs

26 Nov 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25819/src
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
win32 fixes
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.35
retrieving revision 1.1.4.36
diff -C2 -d -r1.1.4.35 -r1.1.4.36
*** SConscript	28 Oct 2005 10:22:46 -0000	1.1.4.35
--- SConscript	26 Nov 2005 12:09:26 -0000	1.1.4.36
***************
*** 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"
***************
*** 352,356 ****
    					""")
    					)
- 		pdenv.Append(LIBS="asiolib")
if 'msvc' in pdenv['TOOLS']:
--- 352,355 ----