--- SConstruct.orig Thu May 20 16:03:14 2004 +++ SConstruct Wed Apr 26 10:47:56 2006 @@ -1,6 +1,8 @@ import os import glob +SConsignFile() + opts = Options( "my_options.py") opts.Add("qt_directory", "Path to Qt directory", "not specified") @@ -20,7 +22,8 @@ env = Environment( ENV = { 'PATH' : os.environ[ 'PATH' ], - 'HOME' : os.environ[ 'HOME' ] # required for distcc + 'HOME' : os.environ[ 'HOME' ], # required for distcc + 'TMPDIR' : os.environ['TMPDIR'] }, options = opts) env.Replace(CPPPATH = [], LIBS = [], LIBPATH = [], CPPDEFINES = [], CXXFLAGS = "", CCFLAGS = "") @@ -112,7 +115,7 @@ def CheckForQtAt(context, qtdir): context.Message('Checking for Qt at %s... ' % qtdir) result = AttemptLinkWithVariables(context, - { "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' }, + { "LINKFLAGS": "-pthread", "LIBS": "qt-mt", "LIBPATH": qtdir + '/lib', "CPPPATH": qtdir + '/include' }, """ #include int main(int argc, char **argv) {