/[escript]/branches/windows_from_1456_trunk_1544_merged_in/SConstruct
ViewVC logotype

Diff of /branches/windows_from_1456_trunk_1544_merged_in/SConstruct

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

revision 1523 by phornby, Tue Apr 22 06:15:31 2008 UTC revision 1536 by phornby, Tue Apr 29 08:08:58 2008 UTC
# Line 215  opts.AddOptions( Line 215  opts.AddOptions(
215    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),
216    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
217    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
218      ('link_flags', 'Linker flags to use (Release build)', None),
219      ('link_flags_debug', 'Linker flags to use (Debug build)', None),
220    
221    ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),    ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
222    ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),    ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
223    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
# Line 485  try: Line 488  try:
488       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
489  except:  except:
490       pass       pass
491    if dodebug:
492         try:
493            flags = env['link_flags_debug']
494            env.Append(LINKFLAGS = flags)
495         except KeyError:
496            pass
497    else:
498         try:
499            flags = env['link_flags']
500            env.Append(LINKFLAGS = flags)
501         except KeyError:
502            pass
503    
504  # ============= Remember what options were used in the compile =====================================  # ============= Remember what options were used in the compile =====================================
505  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:

Legend:
Removed from v.1523  
changed lines
  Added in v.1536

  ViewVC Help
Powered by ViewVC 1.1.26