[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35602] branches/bmesh/blender/source/ blender/makesdna/intern/SConscript: scons fix

[Joseph Eagar]

Revision: 35602
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35602
Author:   joeedh
Date:     2011-03-17 23:35:51 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
scons fix

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/makesdna/intern/SConscript

Modified: branches/bmesh/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/intern/SConscript	2011-03-17 23:30:29 UTC (rev 35601)
+++ branches/bmesh/blender/source/blender/makesdna/intern/SConscript	2011-03-17 23:35:51 UTC (rev 35602)
@@ -65,20 +65,10 @@
     else:
         dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
 else:
-<<<<<<< .working
-	if USE_WINE:
-		dna.Command ('dna.c', '', 'wine ' + ap(root_build_dir+os.sep+"makesdna $TARGET"))
-	else:
-		if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'):
-			dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET")
-		else:
-			dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna $TARGET")
-=======
     if USE_WINE:
         dna.Command ('dna.c', '', 'wine ' + root_build_dir+os.sep+"makesdna $TARGET")
     else:
         dna.Command ('dna.c', '', root_build_dir+os.sep+"makesdna.exe $TARGET")
->>>>>>> .merge-right.r35190
 
 obj = ['intern/dna.c', 'intern/dna_genfile.c']
 Return ('obj')