diff options
| author | Lawrence D'Oliveiro <from-blender@geek-central.gen.nz> | 2014-04-28 17:07:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-29 16:03:08 +0400 |
| commit | ef3eb7adc6f283145e28781a05b3b5e73a6cf083 (patch) | |
| tree | 048a2471113205b3b4cccab64c64139bae989726 /source | |
| parent | 7544961ea5177b61b8f1f07e156cac28afe29764 (diff) | |
Code cleanup: don't use unnecessary .exe extension in scons, simplify code.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D236
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 10 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 10 |
2 files changed, 4 insertions, 16 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 35b4ff262ed..50c26eb6732 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -85,15 +85,9 @@ dna.Depends ('dna.c', makesdna) dna.Depends ('dna.c', header_files) if env['OURPLATFORM'] != 'linuxcross': - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'win64-mingw'): - dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") - else: - dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") + dna.Command ('dna.c', '', "\"" + root_build_dir+os.sep+"makesdna\" $TARGET") else: - 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") + dna.Command ('dna.c', '', ('', 'wine ')[USE_WINE] + root_build_dir+os.sep+"makesdna $TARGET") # TODO, get WITH_DNA_GHASH working, see CMake's 'WITH_DNA_GHASH' obj = ['intern/dna.c', 'intern/dna_genfile.c'] diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 29d84a8d245..f33dda2ae02 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -206,15 +206,9 @@ rna.Depends (generated_files, makesrna) build_dir = Dir(".").abspath + os.sep if env['OURPLATFORM'] != 'linuxcross': - 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 + '"' ) + rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna\" \"" + build_dir + '"' ) else: - 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) + rna.Command (generated_files, '', ('', 'wine ')[USE_WINE] + root_build_dir+os.sep+"makesrna.exe " + build_dir) obj = ['intern/rna_access.c'] |