Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28106/src
Modified Files: Tag: devel_0_38 SConscript Log Message: scons update
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** SConscript 18 Jun 2005 18:48:32 -0000 1.1.2.1 --- SConscript 19 Jun 2005 11:10:40 -0000 1.1.2.2 *************** *** 13,22 **** BoolOption('nosimd', 'Build without simd instructions', False), BoolOption('threadedsf', 'Build with threaded soundfiler', False), ! BoolOption('atomic', 'Build with atomic operations', True), BoolOption('newhash', 'Build with 16 bit symbol hash table', True), BoolOption('lockfree', 'Build with lock-free fifos', True), BoolOption('pdlib', 'Build with pdlib', False), ('optimize', 'Optimize for specific architecture', None), ! ('prefix', 'install prefix', '/usr/local') )
--- 13,22 ---- BoolOption('nosimd', 'Build without simd instructions', False), BoolOption('threadedsf', 'Build with threaded soundfiler', False), ! BoolOption('atomic', 'Build with atomic operations', False), BoolOption('newhash', 'Build with 16 bit symbol hash table', True), BoolOption('lockfree', 'Build with lock-free fifos', True), BoolOption('pdlib', 'Build with pdlib', False), ('optimize', 'Optimize for specific architecture', None), ! ('prefix', 'install prefix', '/usr/local') )
*************** *** 30,35 **** # general configuration
- prefix = pdenv['prefix'] - sources = Split("""d_arithmetic.c d_array.c --- 30,33 ---- *************** *** 101,131 **** defs = []
! ###################################################################### # # configure the build conf = pdenv.Configure()
if not conf.CheckLib('m','sin'): Exit(1)
if not conf.CheckLib('tcl'): ! Exit(1)
if not conf.CheckLib('tk'): ! Exit(1) ! ! if not conf.CheckLib('X11', 'XCreateWindow'): ! Exit(1)
if not conf.CheckLib('pthread', 'pthread_create'): Exit(1)
! if conf.CheckLib('dl', 'dlopen'): ! defs.append('DL_OPEN')
! jack = conf.CheckLib('jack','jack_activate') ! alsa = conf.CheckLib('asound','snd_pcm_info') ! portaudio = conf.CheckLib('portaudio','Pa_Initialize')
env=conf.Finish() --- 99,158 ---- defs = []
! ###################################################################### ###################################################################### # # configure the build + # conf = pdenv.Configure()
if not conf.CheckLib('m','sin'): + print "can't find Math library" Exit(1)
if not conf.CheckLib('tcl'): ! for i in range (2,10): ! if conf.CheckLib('tcl-8.%d' % i): ! break ! else: ! print "can't find tcl" ! Exit(1)
if not conf.CheckLib('tk'): ! for i in range (2,10): ! if conf.CheckLib('tk-8.%d' % i): ! break ! else: ! print "can't find tk" ! Exit(1)
if not conf.CheckLib('pthread', 'pthread_create'): + print "can't find pthread library" Exit(1)
! ###################################################################### ! # ! # system specific configuration
! if env['PLATFORM'] == 'posix': ! if conf.CheckLib('dl', 'dlopen'): ! defs.append('DL_OPEN') ! else: ! print "libdl not found. dynamic loading of externals disabled" ! ! ! jack = conf.CheckLib('jack','jack_activate') ! alsa = conf.CheckLib('asound','snd_pcm_info') ! ! ! portaudio = conf.CheckLib('portaudio','Pa_Initialize') ! ! if not portaudio: ! print "libportaudio not found" ! ! if env['PLATFORM'] == 'win32': ! pass ! ! if env['PLATFORM'] == 'osx': ! pass
env=conf.Finish() *************** *** 182,186 ****
if pdenv['PLATFORM'] == 'win32': ! sources.append(windows_sources + simd_sse_vc_sources) pdenv.Append(CPPDEFINES=windows_defs)
--- 209,216 ----
if pdenv['PLATFORM'] == 'win32': ! if ['msvc'] in pdenv['TOOLS']: ! sources.append(windows_sources + simd_sse_vc_sources) ! else: ! sources.append(windows_sources + simd_sse_gcc_sources) pdenv.Append(CPPDEFINES=windows_defs)
*************** *** 197,201 ****
linux_defs = Split("UNISTD UNIX USEAPI_OSS") ! linux_defs.append('INSTALL_PREFIX=\"%s\"' % prefix)
linux_libs = [] --- 227,231 ----
linux_defs = Split("UNISTD UNIX USEAPI_OSS") ! linux_defs.append('INSTALL_PREFIX=\"%s\"' % pdenv['prefix'])
linux_libs = [] *************** *** 231,235 ****
osx_sources = pa_sources + pm_sources + simd_ve_gcc_sources ! osx_defs = Split("UNIX")
if pdenv['PLATFORM'] == 'osx': --- 261,265 ----
osx_sources = pa_sources + pm_sources + simd_ve_gcc_sources ! osx_defs = Split("UNIX MACOSX")
if pdenv['PLATFORM'] == 'osx': *************** *** 263,267 **** flags += " -O3"
! if pdenv['optimize']: if ['msvc'] in pdenv['TOOLS']: pass # is there any machine optmizisation on msvc? --- 293,297 ---- flags += " -O3"
! if pdenv['optimize'] != None: if ['msvc'] in pdenv['TOOLS']: pass # is there any machine optmizisation on msvc? *************** *** 287,312 **** if pdenv['pdlib']: pdlib = pdenv.SharedLibrary('pd', sources) ! pdenv.Append(LIBS=pdlib) ! pd = pdenv.Program('pd', 's_entry.c') ! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdstarter) else: ! pd = pdenv.Program('pd', ['s_entry.c', sources], LINKFLAGS="-Wl,-export-dynamic") - Default(pdwatchdog, pdsend, pdreceive, pdgui, pd) - - - ###################################################################### - # - # installing stuff
! if pdenv['PLATFORM'] == 'posix': ! pdenv.Install(prefix+'/bin', pdsend) ! pdenv.Install(prefix+'/bin', pdreceive) ! pdenv.Install(prefix+'/bin', pd) ! pdenv.Install(prefix+'/lib/pd/bin', pdgui) ! pdenv.Install(prefix+'/lib/pd/bin', pdwatchdog)
- if pdenv['pdlib']: - pdenv.Install(prefix+'/lib', pdlib)
! pdenv.Alias('install', prefix) --- 317,328 ---- 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)
! Return("pdwatchdog pdsend pdreceive pdgui pd pdlib")