[Bf-blender-cvs] [3150925] master: Partially revert ef3eb7adc6f283145e28781a05b3b5e73a6cf083

[Joshua Leung]

Commit: 3150925ae8f31a184d229f98a5f8d9262833738b
Author: Joshua Leung
Date:   Wed Apr 30 14:58:06 2014 +1200
https://developer.blender.org/rB3150925ae8f31a184d229f98a5f8d9262833738b

Partially revert ef3eb7adc6f283145e28781a05b3b5e73a6cf083

The .exe extension *is* needed on Windows for makesrna, contray to the
patch author's protestations otherwise. Omitting it breaks compilation
on mingw at least (i.e. "rename()" fails). Thanks to "PerfectionCat"
for narrowing down this bug.

makesdna on the other hand still seems to work ok from a quick test I did.
Unless more issues crop up, just reverting this part of the patch should
be ok, though IMO these changes were unnecessary in the first place.

===================================================================

M	source/blender/makesrna/intern/SConscript

===================================================================

diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index f33dda2..ff75d9a 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -206,7 +206,10 @@ rna.Depends (generated_files, makesrna)
 build_dir = Dir(".").abspath + os.sep
     
 if env['OURPLATFORM'] != 'linuxcross':
-    rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \""  + build_dir + '"' )
+    if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'win64-mingw'):
+        rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \""  + build_dir )
+    else:
+        rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \""  + build_dir + '"' )
 else:
     rna.Command (generated_files, '', ('', 'wine ')[USE_WINE] + root_build_dir+os.sep+"makesrna.exe "  + build_dir)