Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14746/src
Modified Files:
Tag: devel_0_38
SConscript
Log Message:
several fixes
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** SConscript 22 Jun 2005 18:50:39 -0000 1.1.2.3
--- SConscript 24 Jun 2005 12:59:03 -0000 1.1.2.4
***************
*** 126,129 ****
--- 126,146 ----
Exit(1)
+ if not conf.CheckHeader('tcl.h'):
+ for i in range (2,10):
+ if conf.CheckLib('tcl-8.%d/tcl' % i):
+ break
+ else:
+ print "can't find tcl header"
+ Exit(1)
+
+ if not conf.CheckHeader('tk.h'):
+ for i in range (2,10):
+ if conf.CheckLib('tk-8.%d/tk' % i):
+ break
+ else:
+ print "can't find tk header"
+ Exit(1)
+
+
if not conf.CheckLib('pthread', 'pthread_create'):
print "can't find pthread library"
***************
*** 196,200 ****
sources.append(pa_sources)
pdenv.Append(CPPDEFINES=Split("USEAPI_PA PA19"))
! pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pablio"))
pdenv.Append(CPPPATH=".")
--- 213,217 ----
sources.append(pa_sources)
pdenv.Append(CPPDEFINES=Split("USEAPI_PA PA19"))
! pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pa_common ../portaudio/pablio"))
pdenv.Append(CPPPATH=".")
***************
*** 296,305 ****
flags += " -O3 -fprefetch-loop-arrays"
! if pdenv.has_key('optimize') and pdenv['optimize'] != None:
! if ['msvc'] in pdenv['TOOLS']:
! pass # is there any machine optmizisation on msvc?
else:
! flags += " -march=" + pdenv['optimize']
!
if not pdenv['nosimd']:
flags += " -mfpmath=sse -mmmx -msse -msse2"
--- 313,326 ----
flags += " -O3 -fprefetch-loop-arrays"
! if pdenv.Dictionary().has_key('optimize'):
! for statement in ["None", "0", "False"]:
! if statement in pdenv['optimize']:
! break
else:
! if ['msvc'] in pdenv['TOOLS']:
! pass # is there any machine optmizisation on msvc?
! else:
! flags += " -march=" + pdenv['optimize']
!
if not pdenv['nosimd']:
flags += " -mfpmath=sse -mmmx -msse -msse2"
***************
*** 307,310 ****
--- 328,332 ----
pdenv.Append(CCFLAGS=flags)
pdenv.Append(CXXFLAGS=flags)
+ pdenv.Append(LINKFLAGS=flags)
######################################################################
***************
*** 319,330 ****
if pdenv['pdlib']:
pdlib = pdenv.SharedLibrary('pd', sources)
pd = pdenv.Program('pd', 's_entry.c', LIBS=['pd'])
else:
! pdlib = pdenv.StaticLibrary('pd', sources)
! pd = pdenv.Program('pd', ['s_entry.c', pdlib],
! LINKFLAGS="-Wl,-export-dynamic")
- Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib)
--- 341,354 ----
if pdenv['pdlib']:
+ # pdenv.Append(LIBPATH="#")
pdlib = pdenv.SharedLibrary('pd', sources)
pd = pdenv.Program('pd', 's_entry.c', LIBS=['pd'])
+ Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib)
else:
! pd = pdenv.Program('pd', ['s_entry.c'] + sources,
! LINKFLAGS=pdenv['LINKFLAGS'] + " -Wl,-export-dynamic")
! pdlib = None
! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd)