forked from bartvdbraak/blender
Code cleanup: don't use unnecessary .exe extension in scons, simplify code.
Reviewed By: brecht Differential Revision: https://developer.blender.org/D236
This commit is contained in:
parent
7544961ea5
commit
ef3eb7adc6
@ -66,10 +66,6 @@ if env['WITH_BF_INTERNATIONAL']:
|
||||
|
||||
locale = env.Clone()
|
||||
|
||||
msgfmt_executable = targetpath
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw', 'win64-mingw'):
|
||||
msgfmt_executable += ".exe"
|
||||
|
||||
# dependencies
|
||||
dependencies = [msgfmt_target]
|
||||
|
||||
@ -82,7 +78,7 @@ if env['WITH_BF_INTERNATIONAL']:
|
||||
po_file = os.path.join(po_dir, f)
|
||||
mo_file = os.path.join(build_dir, os.path.splitext(f)[0] + ".mo")
|
||||
|
||||
command = "\"%s\" \"%s\" \"%s\"" % (msgfmt_executable, po_file, mo_file)
|
||||
command = "\"%s\" \"%s\" \"%s\"" % (targetpath, po_file, mo_file)
|
||||
|
||||
locale.Command(mo_file, po_file, command)
|
||||
locale.Depends(mo_file, dependencies)
|
||||
|
@ -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']
|
||||
|
@ -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']
|
||||
|
Loading…
Reference in New Issue
Block a user