Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18875
Modified Files: Tag: devel_0_39 SConscript Log Message: cleaned up win32 stuff
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.28 retrieving revision 1.1.4.29 diff -C2 -d -r1.1.4.28 -r1.1.4.29 *** SConscript 4 Oct 2005 22:23:56 -0000 1.1.4.28 --- SConscript 5 Oct 2005 07:40:11 -0000 1.1.4.29 *************** *** 25,30 **** BoolOption('wall', 'Build with a wall of warnings', False), BoolOption('shared', 'Build against shared C libraries (for Windows)', True), ! )
opt.Update(pdenv)
--- 25,38 ---- BoolOption('wall', 'Build with a wall of warnings', False), BoolOption('shared', 'Build against shared C libraries (for Windows)', True), ! ) ! ! if pdenv['PLATFORM'] == 'win32': ! opt.AddOptions( ! ('asiopath', 'Path to ASIOSDK', None), ! ('tclpath', 'Path to tcl', None), ! ('pthreadspath', 'Path to pthreads', None) ! )
+ opt.Update(pdenv)
*************** *** 87,90 **** --- 95,122 ---- # determine pthread and tcl/tk lib layout if pdenv['PLATFORM'] == 'win32': + if pdenv['pthreadspath']: + path_pthread = pdenv['pthreadspath'] + else: + print "Please enter path to pthread library" + Exit(1) + + if pdenv['tclpath']: + path_tcl = pdenv['tclpath'] + else: + print "Please enter path to tcl" + Exit(1) + + if pdenv['asiopath']: + path_asio = pdenv['asiopath'] + else: + print "Please enter path to ASIO SDK" + 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+'/pc']) + pdenv.Append(LIBPATH=[path_asio]) + # portaudio = False sep = "" *************** *** 121,135 **** #
- path_pthread="c:/data/prog/packs/pthreads" - path_tcl="c:/programme/prog/tcl" - path_asio="c:/data/prog/audio/asiosdk2" - - 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+'/pc']) - pdenv.Append(LIBPATH=[path_asio]) - - add_cpppath = []
--- 153,156 ---- *************** *** 258,261 **** --- 279,283 ----
if pdenv['PLATFORM'] == 'win32': + pdenv.Append(CPPDEFINES=["MSW","NT"]) pdenv.Append(LIBS=Split("ole32 winmm wsock32 advapi32"))