griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

scons fix

Browse Source
This commit is contained in:
Joseph Eagar
2011-03-17 23:35:51 +00:00
parent bbbbea6024
commit 3cb70bd2c5
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/makesdna/intern/SConscript
View File

@@ -65,20 +65,10 @@ if env['OURPLATFORM'] != 'linuxcross':
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')