comparison build/win32-config.py @ 394:5bb52a43f48b

Fixed a small issue when building with scons on windows. If you have another version of mingw in PATH it would use that one instead. Also updated the a couple SWIG interfaces to handle simple output parameters as described in ticket 340.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 26 Jan 2010 16:53:51 +0000
parents 847c6ec4544e
children 81641655bc38
comparison
equal deleted inserted replaced
393:d819a70949d2 394:5bb52a43f48b
8 path = os.getcwd() 8 path = os.getcwd()
9 9
10 swigdir = os.path.join(path, 'build', 'win32', 'applications', 'swigwin-1.3.40') 10 swigdir = os.path.join(path, 'build', 'win32', 'applications', 'swigwin-1.3.40')
11 mingwbindir = os.path.join(path, 'build', 'win32', 'applications', 'mingw', 'bin') 11 mingwbindir = os.path.join(path, 'build', 'win32', 'applications', 'mingw', 'bin')
12 12
13 env.AppendENVPath('PATH', swigdir) 13 env.PrependENVPath('PATH', swigdir)
14 env.AppendENVPath('PATH', mingwbindir) 14 env.PrependENVPath('PATH', mingwbindir)
15 15
16 includepath = os.path.join(path, 'build', 'win32', 'includes') 16 includepath = os.path.join(path, 'build', 'win32', 'includes')
17 staticlibpath = os.path.join(path, 'build', 'win32', 'static_libs', 'mingw') 17 staticlibpath = os.path.join(path, 'build', 'win32', 'static_libs', 'mingw')
18 18
19 env.Append(CPPPATH = [includepath + '\\libogg', includepath + '\\openal', includepath + '\\sdl_image', includepath + '\\zlib', includepath + '\\libguichan', includepath + '\\boost_1_38_0', includepath + '\\libvorbis', includepath + '\\libpng', includepath + '\\sdl_ttf', includepath + '\\sdl', includepath + '\\python26', includepath + '\\unittest++\\src']) 19 env.Append(CPPPATH = [includepath + '\\libogg', includepath + '\\openal', includepath + '\\sdl_image', includepath + '\\zlib', includepath + '\\libguichan', includepath + '\\boost_1_38_0', includepath + '\\libvorbis', includepath + '\\libpng', includepath + '\\sdl_ttf', includepath + '\\sdl', includepath + '\\python26', includepath + '\\unittest++\\src'])