Attachment #101994 for bug #145445

Lines 6-14 Link Here

(-)SConstruct.old (-2 / +2 lines)
6	env = Environment( ENV = os.environ,	6	env = Environment( ENV = os.environ,
7	CCFLAGS = [ '-Wall', '-O2' ],	7	CCFLAGS = [ '-Wall', '-O2' ],
8	CXXFLAGS = [ '-Wall', '-O2' ],	8	CXXFLAGS = [ '-Wall', '-O2' ],
9	CPPPATH = [ '/usr/local/include', '/usr/X11R6/include' ],	9	CPPPATH = [ '/usr/qt/3/include', '/usr/local/include', '/usr/X11R6/include' ],
10	LIBS = [ ],	10	LIBS = [ ],
11	LIBPATH = [ '/usr/local/lib', '/usr/X11R6/lib' ],	11	LIBPATH = [ '/usr/qt/3/lib', '/usr/local/lib', '/usr/X11R6/lib' ],
12	tools = [ 'default', 'qt' ] );	12	tools = [ 'default', 'qt' ] );
13		13
14	for key in ['CC', 'CCFLAGS', 'CXX', 'CXXFLAGS', 'CPPPATH', 'LIBPATH' ]:	14	for key in ['CC', 'CCFLAGS', 'CXX', 'CXXFLAGS', 'CPPPATH', 'LIBPATH' ]:

Lines 21-29 Link Here

(-)qpxtool/SConscript.old (-3 / +3 lines)
21	LIBPATH = [ "../lib/lib" ] )	21	LIBPATH = [ "../lib/lib" ] )
22		22
23	if sys.platform.startswith('linux'):	23	if sys.platform.startswith('linux'):
24	env.Append(CPPATH = ['/usr/lib/qt/include', '/usr/X11R6/include' ],	24	env.Append(CPPATH = ['/usr/qt/3/include', '/usr/X11R6/include' ],
25	LINKFLAGS = [ '-Wl,-rpath,/usr/lib/qt/lib' ],	25	LINKFLAGS = [ '-Wl,-rpath,/usr/qt/3/lib' ],
26	LIBPATH = [ '/usr/X11R6/lib', '/usr/lib/qt/lib' ] )	26	LIBPATH = [ '/usr/X11R6/lib', '/usr/qt/3/lib' ] )
27	elif sys.platform.startswith('freebsd'):	27	elif sys.platform.startswith('freebsd'):
28	env.Append(LIBS = 'cam', LINKFLAGS = '-pthread')	28	env.Append(LIBS = 'cam', LINKFLAGS = '-pthread')
29		29

Return to bug 145445