[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18711] branches/blender2.5/blender/source /blender/makesrna/intern/SConscript: use wine for cross compiling

Campbell Barton ideasman42 at gmail.com
Wed Jan 28 10:33:14 CET 2009


Revision: 18711
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18711
Author:   campbellbarton
Date:     2009-01-28 10:32:31 +0100 (Wed, 28 Jan 2009)

Log Message:
-----------
use wine for cross compiling

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-01-28 06:32:47 UTC (rev 18710)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-01-28 09:32:31 UTC (rev 18711)
@@ -32,10 +32,16 @@
 								 '../../windowmanager'])
 
 if env['OURPLATFORM'] == 'linuxcross':
-    makesrna_tool.Replace(CC='gcc')
-    makesrna_tool.Replace(AR='ar')
-    makesrna_tool.Replace(LINK='gcc')
+	USE_WINE = True # when cross compiling on linux 64bit this is useful
+else:
+	USE_WINE = False
 
+if not USE_WINE:
+	if env['OURPLATFORM'] == 'linuxcross':
+		makesdna_tool.Replace(CC='gcc')
+		makesdna_tool.Replace(AR='ar')
+		makesdna_tool.Replace(LINK='gcc')
+
 if sys.platform != 'cygwin':
     makesrna_tool.Append (CCFLAGS = cflags)
 makesrna_tool.Append (CPPDEFINES = defines)
@@ -74,7 +80,13 @@
     rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna " + build_dir)
 else:
     rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+	
+    if USE_WINE:
+        rna.Command (generated_files, '', 'wine ' + root_build_dir+os.sep+"makesrna.exe "  + build_dir)
+    else:
+        rna.Command (generated_files, '', root_build_dir+os.sep+"makesrna.exe "  + build_dir)
 
+
 obj = ['intern/rna_access.c', 'intern/rna_dependency.c']
 for generated_file in generated_files:
 	obj += ['intern/' + generated_file]





More information about the Bf-blender-cvs mailing list