/[escript]/branches/scons-dev/SConstruct
ViewVC logotype

Diff of /branches/scons-dev/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1698 by ksteube, Tue Aug 5 01:57:39 2008 UTC revision 1699 by ksteube, Thu Aug 14 02:38:23 2008 UTC
# Line 55  opts.AddOptions( Line 55  opts.AddOptions(
55    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),
56    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),
57    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),
58      ('cc_extra', 'Extra C/C++ flags', ''),
59    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
60    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
61    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'yes'),    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'yes'),
# Line 236  env.Append(LIBPATH     = [Dir('lib')]) Line 237  env.Append(LIBPATH     = [Dir('lib')])
237    
238  env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])  env.Append(CPPDEFINES = ['ESCRIPT_EXPORTS', 'FINLEY_EXPORTS'])
239    
240    if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])
241    
242  if env['usepedantic']: env.Append(CCFLAGS = pedantic)  if env['usepedantic']: env.Append(CCFLAGS = pedantic)
243    
244  # MS Windows  # MS Windows

Legend:
Removed from v.1698  
changed lines
  Added in v.1699

  ViewVC Help
Powered by ViewVC 1.1.26