Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26899
Modified Files: Tag: devel_0_39 SConscript Log Message: reverting binary location to ./bin fixing -sse2 switch
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.19 retrieving revision 1.1.4.20 diff -C2 -d -r1.1.4.19 -r1.1.4.20 *** SConscript 23 Aug 2005 02:21:17 -0000 1.1.4.19 --- SConscript 23 Aug 2005 21:28:35 -0000 1.1.4.20 *************** *** 417,421 **** if not pdenv['noDAZ']: pdenv.Append(CPPDEFINES='DAZ') ! flags += "-msse2" if conf.TryCompile("""#include "stdlib.h" --- 417,421 ---- if not pdenv['noDAZ']: pdenv.Append(CPPDEFINES='DAZ') ! flags += " -msse2" if conf.TryCompile("""#include "stdlib.h" *************** *** 439,457 **** # binaries
! pdwatchdog = pdenv.Program('../obj/pd-watchdog', "s_watchdog.c") ! pdsend = pdenv.Program('../obj/pdsend', "u_pdsend.c") ! pdreceive = pdenv.Program('../obj/pdreceive', "u_pdreceive.c") ! pdtk = pdenv.InstallAs('../obj/pd.tk', 'u_main.tk')
###################################################################### # build pd's gui if pdenv['PLATFORM']=='posix': ! pdgui = pdenv.Program('../obj/pd-gui', Split("t_main.c t_tkcmd.c"))
if pdenv['PLATFORM']=='darwin': ! pdgui = pdenv.SharedLibrary('../obj/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../obj/pdtcl', Split("t_main.c t_tkcmd.c"))
--- 439,457 ---- # binaries
! pdwatchdog = pdenv.Program('../bin/pd-watchdog', "s_watchdog.c") ! pdsend = pdenv.Program('../bin/pdsend', "u_pdsend.c") ! pdreceive = pdenv.Program('../bin/pdreceive', "u_pdreceive.c") ! pdtk = pdenv.InstallAs('../bin/pd.tk', 'u_main.tk')
###################################################################### # build pd's gui if pdenv['PLATFORM']=='posix': ! pdgui = pdenv.Program('../bin/pd-gui', Split("t_main.c t_tkcmd.c"))
if pdenv['PLATFORM']=='darwin': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"))
*************** *** 460,469 ****
if pdenv['pdlib']: ! pdlib = pdenv.SharedLibrary('../obj/pd', sources) pdenv.Append(LIBPATH=['.']) ! pd = pdenv.Program('../obj/pd', 's_entry.c', LIBS=['pd']) Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: ! pd = pdenv.Program('../obj/pd', ['s_entry.c'] + sources) pdlib = None Default(pdsend, pdreceive, pdgui, pd, pdtk) --- 460,469 ----
if pdenv['pdlib']: ! pdlib = pdenv.SharedLibrary('../bin/pd', sources) pdenv.Append(LIBPATH=['.']) ! pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd']) Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: ! pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources) pdlib = None Default(pdsend, pdreceive, pdgui, pd, pdtk)