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

Diff of /branches/diaplayground/SConstruct

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

revision 5063 by caltinay, Fri Jun 20 00:36:10 2014 UTC revision 5064 by caltinay, Fri Jun 20 05:24:53 2014 UTC
# Line 23  from site_init import * Line 23  from site_init import *
23    
24  # Version number to check for in options file. Increment when new features are  # Version number to check for in options file. Increment when new features are
25  # added or existing options changed.  # added or existing options changed.
26  REQUIRED_OPTS_VERSION=201  REQUIRED_OPTS_VERSION=202
27    
28  # MS Windows support, many thanks to PH  # MS Windows support, many thanks to PH
29  IS_WINDOWS = (os.name == 'nt')  IS_WINDOWS = (os.name == 'nt')
# Line 187  if len(vars.UnknownVariables())>0: Line 187  if len(vars.UnknownVariables())>0:
187          print("Unknown option '%s'" % k)          print("Unknown option '%s'" % k)
188      Exit(1)      Exit(1)
189    
190  env.Tool('nvcc')  if env['cuda']:
191        env.Tool('nvcc')
192    
193  # create dictionary which will be populated with info for buildvars file  # create dictionary which will be populated with info for buildvars file
194  env['buildvars']={}  env['buildvars']={}
# Line 287  if env['ld_extra']  != '': env.Append(LI Line 288  if env['ld_extra']  != '': env.Append(LI
288    
289  if env['nvccflags'] != 'default':  if env['nvccflags'] != 'default':
290      env['NVCCFLAGS'] = env['nvccflags']      env['NVCCFLAGS'] = env['nvccflags']
291      env['SHNVCCFLAGS'] = env['nvccflags']      env['SHNVCCFLAGS'] = env['nvccflags'] + ' -shared'
292    
293  if env['BADPYTHONMACROS']: env.Append(CXXFLAGS = ' -DBADPYTHONMACROS')  if env['BADPYTHONMACROS']: env.Append(CXXFLAGS = ' -DBADPYTHONMACROS')
294    

Legend:
Removed from v.5063  
changed lines
  Added in v.5064

  ViewVC Help
Powered by ViewVC 1.1.26