Revision: 30490
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30490
Author: nazgul
Date: 2010-07-19 11:02:27 +0200 (Mon, 19 Jul 2010)
Log Message:
-----------
- 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
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/source/blender/blenlib/intern/storage.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2010-07-19 08:55:06 UTC (rev 30489)
+++ trunk/blender/SConstruct 2010-07-19 09:02:27 UTC (rev 30490)
@@ -46,8 +46,11 @@
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 @@
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 @@
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
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2010-07-19
08:55:06 UTC (rev 30489)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2010-07-19
09:02:27 UTC (rev 30490)
@@ -182,7 +182,7 @@
CC_WARN = [ '-Wall' ]
-LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm',
'-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32'] #'-lutil', '-lc', '-lm',
'-ldl', '-lpthread' ]
+LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm',
'-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32', '-lmsvcr90'] #'-lutil',
'-lc', '-lm', '-ldl', '-lpthread' ]
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py
2010-07-19 08:55:06 UTC (rev 30489)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py
2010-07-19 09:02:27 UTC (rev 30490)
@@ -173,7 +173,7 @@
CC_WARN = [ '-Wall' ]
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm',
'-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm',
'-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid',
'-lmsvcr90']
BF_DEBUG = False
BF_DEBUG_CCFLAGS= ['-g']
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2010-07-19
08:55:06 UTC (rev 30489)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2010-07-19
09:02:27 UTC (rev 30490)
@@ -447,7 +447,7 @@
BLI_strncpy(tmp, name, FILE_MAXDIR+FILE_MAXFILE);
len = strlen(tmp);
if (len > 3 && ( tmp[len-1]=='\\' || tmp[len-1]=='/') ) tmp[len-1] =
'\0';
- res = _stat(tmp, &st);
+ res = _stat64i32(tmp, &st);
if (res == -1) return(0);
#else
struct stat st;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
