|
Lines 281-287
Link Here
|
| 281 |
if os.environ.has_key('CC'): |
281 |
if os.environ.has_key('CC'): |
| 282 |
env['CC'] = os.environ['CC'] |
282 |
env['CC'] = os.environ['CC'] |
| 283 |
if os.environ.has_key('CFLAGS'): |
283 |
if os.environ.has_key('CFLAGS'): |
| 284 |
env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) |
284 |
env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) |
| 285 |
if os.environ.has_key('CXX'): |
285 |
if os.environ.has_key('CXX'): |
| 286 |
env['CXX'] = os.environ['CXX'] |
286 |
env['CXX'] = os.environ['CXX'] |
| 287 |
if os.environ.has_key('CXXFLAGS'): |
287 |
if os.environ.has_key('CXXFLAGS'): |
|
Lines 835-842
Link Here
|
| 835 |
env.Append(CPPPATH=["$VCINSTALLDIR/include/atl", "C:/Program Files/Microsoft Platform SDK/Include/atl"]) |
835 |
env.Append(CPPPATH=["$VCINSTALLDIR/include/atl", "C:/Program Files/Microsoft Platform SDK/Include/atl"]) |
| 836 |
env.Append(CPPDEFINES = 'WIN'+bitwidth) #for soundtouch |
836 |
env.Append(CPPDEFINES = 'WIN'+bitwidth) #for soundtouch |
| 837 |
else: |
837 |
else: |
| 838 |
env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax |
838 |
env.Append(CCFLAGS = Split(""" -Wall -Wextra """)) # omghax |
| 839 |
env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g""")) |
839 |
env.Append(LINKFLAGS = Split(""" -Wall -Wextra """)) |
| 840 |
if platformString != 'osx': |
840 |
if platformString != 'osx': |
| 841 |
env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
841 |
env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
| 842 |
env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
842 |
env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") |
|
Lines 1447-1452
Link Here
|
| 1447 |
print "Building with flags: " + build_flags |
1447 |
print "Building with flags: " + build_flags |
| 1448 |
print "================\n" |
1448 |
print "================\n" |
| 1449 |
|
1449 |
|
|
|
1450 |
env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' |
| 1451 |
env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' |
| 1452 |
|
| 1450 |
#Save the options to cache |
1453 |
#Save the options to cache |
| 1451 |
vars.Save(cachefile, env) |
1454 |
vars.Save(cachefile, env) |
| 1452 |
|
1455 |
|
