Update of /cvsroot/cppunit/cppunit2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12196
Modified Files:
sconstruct
Log Message:
* updated environment definition to build correctly on aix and sun.
Index: sconstruct
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/sconstruct,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sconstruct 24 Feb 2005 07:15:03 -0000 1.3
--- sconstruct 26 Feb 2005 11:42:21 -0000 1.4
***************
*** 7,18 ****
# Store all dependencies signature in a database
! SConsignFile( 'buildscons/.sconsign.dbm' )
! #env = Environment( CCFLAGS = '-GX -GR -nologo',
! env = Environment( CCFLAGS = '',
! CPPPATH = '#include',
! LIBPATH = '#libs',
! tools=['mingw'] )
Export( 'env' )
--- 7,36 ----
# Store all dependencies signature in a database
! sconsign_path = os.path.join( Dir('#buildscons').abspath, '.sconsign.dbm' )
! SConsignFile( sconsign_path )
+ platform = 'mingw'
! if platform == 'sun':
! env = Environment( ENV = {'PATH' : os.environ['PATH']},
! CPPPATH = '#include',
! LIBPATH = '#libs',
! tools=['default','suncc'] )
! elif platform == 'aix':
! env = Environment( ENV = {'PATH' : os.environ['PATH']},
! CCFLAGS = '-qrtti=all',
! CPPPATH = '#include',
! LIBPATH = '#libs',
! tools=['default','aixcc'],
! CXX ='xlC_r',
! LINKFLAGS='-bh:5' ) # -bh:5 remove duplicate symbol warning
! elif platform == 'msvc':
! env = Environment( CCFLAGS = '-GX -GR -nologo',
! CPPPATH = '#include',
! LIBPATH = '#libs' )
! elif platform == 'mingw':
! env = Environment( CPPPATH = '#include',
! LIBPATH = '#libs',
! tools=['default','mingw'] )
Export( 'env' )
|
