[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28940] trunk/blender: Fixes for cross-compilation:

[Sergey Sharybin]

Revision: 28940
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28940
Author:   nazgul
Date:     2010-05-23 23:20:13 +0200 (Sun, 23 May 2010)

Log Message:
-----------
Fixes for cross-compilation:

- Set env['CC'] and env['CXX'] as default values for
  CC and CXX variables. This fixes problem with overwriting
  auto-guessed compilators when reading config files
- Added new prefix for mingw tools

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/linuxcross-config.py
    trunk/blender/tools/btools.py
    trunk/blender/tools/crossmingw.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-05-23 20:39:21 UTC (rev 28939)
+++ trunk/blender/SConstruct	2010-05-23 21:20:13 UTC (rev 28940)
@@ -182,7 +182,7 @@
 else:
 	print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
 
-opts = btools.read_opts(optfiles, B.arguments)
+opts = btools.read_opts(env, optfiles, B.arguments)
 opts.Update(env)
 
 if not env['BF_FANCY']:

Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py	2010-05-23 20:39:21 UTC (rev 28939)
+++ trunk/blender/config/linuxcross-config.py	2010-05-23 21:20:13 UTC (rev 28940)
@@ -174,9 +174,6 @@
 WITH_BF_RAYOPTIMIZATION = False
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
-CC = 'i586-mingw32msvc-gcc'
-CXX = 'i586-mingw32msvc-g++'
-
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 
 CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS']

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2010-05-23 20:39:21 UTC (rev 28939)
+++ trunk/blender/tools/btools.py	2010-05-23 21:20:13 UTC (rev 28940)
@@ -160,7 +160,7 @@
     env['SPAWN'] = buf.ourspawn
 
 
-def read_opts(cfg, args):
+def read_opts(env, cfg, args):
     localopts = Variables.Variables(cfg, args)
     localopts.AddVariables(
         ('LCGDIR', 'location of cvs lib dir'),
@@ -400,8 +400,8 @@
         ('BF_BUILDDIR', 'Build dir', ''),
         ('BF_INSTALLDIR', 'Installation dir', ''),
 
-        ('CC', 'C compiler to use', ''),
-        ('CXX', 'C++ compiler to use', ''),
+        ('CC', 'C compiler to use', env['CC']),
+        ('CXX', 'C++ compiler to use', env['CXX']),
 
         (BoolVariable('BF_BUILDINFO', 'Buildtime in splash if true', True)),
 

Modified: trunk/blender/tools/crossmingw.py
===================================================================
--- trunk/blender/tools/crossmingw.py	2010-05-23 20:39:21 UTC (rev 28939)
+++ trunk/blender/tools/crossmingw.py	2010-05-23 21:20:13 UTC (rev 28940)
@@ -50,6 +50,7 @@
     i486-mingw32msvc-
     i586-mingw32msvc-
     i686-mingw32msvc-
+    i686-pc-mingw32-
 """)
 
 def find(env):