[PD-cvs] externals/build SConstruct,1.10,1.11

[carmen rocco]

Update of /cvsroot/pure-data/externals/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21963

Modified Files:
	SConstruct 
Log Message:
Cwin32 + prefix settable
adding 


Index: SConstruct
===================================================================
RCS file: /cvsroot/pure-data/externals/build/SConstruct,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SConstruct	12 Jul 2005 19:11:08 -0000	1.10
--- SConstruct	16 Jul 2005 22:47:49 -0000	1.11
***************
*** 2,33 ****
  import os
  import re
- prefix = "/usr/local/lib/pd"
- 
- platform = os.uname()[0]
  
! if re.match("Linux", platform) != None:
!     OSdefine = 'UNIX'
!     extSuffix = '.pd_linux'
! elif re.match("MINGW", platform) != None:
!     OSdefine = 'NT'
!     extSuffix = '.dll'
! elif re.match("Darwin", platform) != None:
!     OSdefine = 'UNIX'
!     extSuffix = '.pd_darwin'
  
! env = Environment(CPPPATH = Split(prefix + '/src /usr/include /usr/local/include . ../../pd/src ../../src src'), CPPDEFINES=['PD', OSdefine], SHLIBPREFIX = '', SHLIBSUFFIX = extSuffix, CCFLAGS = '-pipe -O2')
  
! ########### delete when namespace conflict issue is finally resolved
! ##(cyclone has all of these, the other versions are from all over the place)
! delete = """
! cd src && test -f prepend.c && rm urn.* match.* prepend.* sinh.c delta~.c reson~.c abs~.c svf~.c matrix~.c atan2~.c avg~.c pmpd.c && echo "poof...no more conflicting externals..!!"
! """
! print os.popen(delete).read()
! ###########
  
  
  # C sources in src/
  for extra in glob.glob('src/*.c'):
!     external = env.SharedLibrary(re.sub("\.c$","",os.path.basename(extra)), extra)
      env.Alias('install', env.Install(os.path.join(prefix, 'extra'), external))
      Default(external)
--- 2,33 ----
  import os
  import re
  
! env = Environment(CPPPATH = Split('/usr/include /usr/local/include . ../../pd/src ../../src src'), CPPDEFINES=['PD'], SHLIBPREFIX = '', CCFLAGS = '-pipe -O2')
  
! opt = Options(['options.cache', 'custom.py'])
! opt.AddOptions(('prefix', 'install prefix', '/usr/local/lib/pd'))
! opt.Update(env)
! opt.Save('options.cache',env)
! prefix = env['prefix']
  
! if env['PLATFORM'] == 'win32':
!     env.Append(CPPDEFINES='NT')
!     env.Append(LINKFLAGS=prefix+'bin/pd.dll')
!     env['SHLIBSUFFIX']='.dll'
! elif env['PLATFORM'] == 'darwin':
!     env.Append(CPPDEFINES='UNIX')
!     env['SHLIBSUFFIX']='.pd_darwin'
! elif env['PLATFORM'] == 'posix':
!     env.Append(CPPDEFINES='UNIX')
!     env['SHLIBSUFFIX']='.pd_linux'
  
+ #remove one-off externals that are also in cyclone
+ print os.popen("""cd src && test -f prepend.c && rm urn.* match.* prepend.* sinh.c delta~.c reson~.c abs~.c svf~.c matrix~.c atan2~.c avg~.c pmpd.c && echo "poof...no more conflicting externals..!!" """).read()
  
  # C sources in src/
  for extra in glob.glob('src/*.c'):
!     name = re.sub("\.c$","",os.path.basename(extra))
!     print name,
!     external = env.SharedLibrary(name,'src/'+name+'.c')
      env.Alias('install', env.Install(os.path.join(prefix, 'extra'), external))
      Default(external)