[PD-cvs] pd/src SConscript,1.1.4.57,1.1.4.58

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11231

Modified Files:
      Tag: devel_0_39
	SConscript 
Log Message:
c++-related changes for future use


Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.57
retrieving revision 1.1.4.58
diff -C2 -d -r1.1.4.57 -r1.1.4.58
*** SConscript	14 Nov 2006 21:43:11 -0000	1.1.4.57
--- SConscript	17 Nov 2006 16:44:35 -0000	1.1.4.58
***************
*** 1,2 ****
--- 1,6 ----
+ # SCons has its own Copy() method; else I might use the following function:
+ # from copy import copy
+ # -- matju
+ 
  Import("env")
  
***************
*** 29,33 ****
      BoolOption('desire', 'Build with desire', False),
      BoolOption('wall', 'Build with a wall of warnings', False),
-     BoolOption('plusplus','Build using C++', False),
      BoolOption('pablio','Build portaudio with pablio', True),
      )
--- 33,36 ----
***************
*** 71,75 ****
  if pdenv['desire']:
      sources += Split("""
!         desire.c m_hash.c
      """)
  else:
--- 74,78 ----
  if pdenv['desire']:
      sources += Split("""
!         desire.o m_hash.c
      """)
  else:
***************
*** 534,541 ****
      #cflags += " -Wall -ansi -pedantic"
  
- if pdenv['plusplus']:
-     cflags += " -xc++"
-     pdenv['CC'] = "g++"
- 
  if pdenv['debug']:
      pdenv.Append(CPPDEFINES=Split("DEBUG"))
--- 537,540 ----
***************
*** 674,677 ****
--- 673,681 ----
  envint.Append(CPPDEFINES='PD_INTERNAL')
  
+ if pdenv['desire']:
+ 	envdesire = pdenv.Copy()
+ 	#envdesire.Append(CCFLAGS=" -xc++")
+ 	desire_o=envdesire.StaticObject(target="desire.c")
+ 
  if pdenv['pdlib']:
      if pdenv['PLATFORM'] == 'win32':
***************
*** 689,692 ****
--- 693,697 ----
      Default(pdwatchdog)
  
+ 
  Export("pdenv")