diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-05-23 07:24:15 +0400 |
commit | f026266e185f90543138a856898f50b2295a12fc (patch) | |
tree | f674a1a1b328a423ec4bdcdc4a11f35e56669e7a /source/SConscript | |
parent | b7fe3258b66698f62f630d0b18431b54b65101ed (diff) |
merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/SConscript')
-rw-r--r-- | source/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/SConscript b/source/SConscript index 9b497edd85a..d3a9373b4d8 100644 --- a/source/SConscript +++ b/source/SConscript @@ -7,5 +7,5 @@ SConscript(['blender/SConscript', if env['WITH_BF_GAMEENGINE']: SConscript (['gameengine/SConscript']) -if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): +if env['OURPLATFORM'] in ('win64-vc', 'win32-vc', 'win32-mingw'): SConscript (['icons/SConscript']) |