diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-07-19 13:02:27 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-07-19 13:02:27 +0400 |
commit | 266438b5e0224de4653ba2a795a069781e926007 (patch) | |
tree | a5554e87b433870e4a5e68001c4b175865d1a2a3 /SConstruct | |
parent | c28c33d19d544fdc69e82e5b6d941431516c588c (diff) |
- Use correct paths for mstoolkit and crossmingw tools in sconscript
- Use _stat64i32 instead of _stat in BLI_exist
Needed for correct compilation by mingw, no sense for msvc
(_stat is equivalent to _stat64i32 in Visual C++ 2005, and later i suppose)
- Added library msvcr90 for mingw to solve linking error to _stat64i32
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index b11df1b4c67..21d25f97777 100644 --- a/SConstruct +++ b/SConstruct @@ -46,8 +46,11 @@ import glob import re from tempfile import mkdtemp +# store path to tools +toolpath=os.path.join(".", "build_files", "scons", "tools") + # needed for importing tools -sys.path.append(os.path.join(".", "build_files", "scons", "tools")) +sys.path.append(toolpath) import Blender import btools @@ -121,7 +124,7 @@ if toolset: print "Using " + toolset if toolset=='mstoolkit': env = BlenderEnvironment(ENV = os.environ) - env.Tool('mstoolkit', ['tools']) + env.Tool('mstoolkit', [toolpath]) else: env = BlenderEnvironment(tools=[toolset], ENV = os.environ) # xxx commented out, as was supressing warnings under mingw.. @@ -170,7 +173,7 @@ else: if crossbuild and env['PLATFORM'] != 'win32': print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC - env.Tool('crossmingw', ['tools']) + env.Tool('crossmingw', [toolpath]) # todo: determine proper libs/includes etc. # Needed for gui programs, console programs should do without it |