comparison SConstruct @ 410:efa51189ffc3

Move the LINKFLAGS to a more appropriate spot.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Sun, 31 Jan 2010 17:17:23 +0000
parents 47eca3c3d59d
children 90acb1d079c0
comparison
equal deleted inserted replaced
409:47eca3c3d59d 410:efa51189ffc3
34 vars = Variables() 34 vars = Variables()
35 vars.Add(PathVariable('DESTDIR', 35 vars.Add(PathVariable('DESTDIR',
36 'Destination directory (prepended to prefix)', 36 'Destination directory (prepended to prefix)',
37 None, 37 None,
38 PathVariable.PathAccept )) 38 PathVariable.PathAccept ))
39 #vars.Add('CXXFLAGS', "")
40 39
41 #propagate the invoking users complete external environment 40 #propagate the invoking users complete external environment
42 env = Environment(variables = vars, 41 env = Environment(variables = vars,
43 ENV = os.environ, 42 ENV = os.environ,
44 DESTDIR = '${DESTDIR}') 43 DESTDIR = '${DESTDIR}')
250 if haveusercxxflags: 249 if haveusercxxflags:
251 env.AppendUnique(CXXFLAGS=usercxxflags) 250 env.AppendUnique(CXXFLAGS=usercxxflags)
252 else: 251 else:
253 env.AppendUnique(CXXFLAGS=['-O0', '-Wall', '-Wno-unused']) 252 env.AppendUnique(CXXFLAGS=['-O0', '-Wall', '-Wno-unused'])
254 253
255 env.AppendUnique(CXXFLAGS=['-ggdb', '-D_DEBUG']) 254 env.AppendUnique(CXXFLAGS=['-g', '-D_DEBUG'])
255 env.AppendUnique(LINKFLAGS=['-Wl')
256 engine_var_dir = os.path.join('build','engine','debug') 256 engine_var_dir = os.path.join('build','engine','debug')
257 tests_var_dir = os.path.join('build','tests','debug') 257 tests_var_dir = os.path.join('build','tests','debug')
258 print "Building DEBUG binaries..." 258 print "Building DEBUG binaries..."
259 else: 259 else:
260 if haveusercxxflags: 260 if haveusercxxflags:
261 env.AppendUnique(CXXFLAGS=usercxxflags) 261 env.AppendUnique(CXXFLAGS=usercxxflags)
262 else: 262 else:
263 env.AppendUnique(CXXFLAGS=['-O2', '-Wall', '-Wno-unused']) 263 env.AppendUnique(CXXFLAGS=['-O2', '-Wall', '-Wno-unused'])
264 264
265 env.AppendUnique(LINKFLAGS=['-Wl'])
265 engine_var_dir = os.path.join('build','engine','release') 266 engine_var_dir = os.path.join('build','engine','release')
266 tests_var_dir = os.path.join('build','tests','release') 267 tests_var_dir = os.path.join('build','tests','release')
267 print "Building RELEASE binaries..." 268 print "Building RELEASE binaries..."
268 269
269 if opengl: 270 if opengl: