Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Musgrove <LetterRip@gmail.com>2010-02-01 21:39:41 +0300
committerTom Musgrove <LetterRip@gmail.com>2010-02-01 21:39:41 +0300
commitf2a8bb34989204dbdfee39cc6279808b5d5a8c9a (patch)
treedf7bfbcac23d77e1d38c5c9a70ff9740c0028aec /source/icons
parent7fe3ab7e8e23fb8750eead8f53802928b734821c (diff)
this restores building on mingw with Collada support, also it restores cross compiling, thanks to Sergey Sharybin for the patch. Note that the icons for linux cross might not be committed here, if not i'll add them in another commit
Diffstat (limited to 'source/icons')
-rw-r--r--source/icons/SConscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/icons/SConscript b/source/icons/SConscript
index c929729f05b..5abb36aafea 100644
--- a/source/icons/SConscript
+++ b/source/icons/SConscript
@@ -1,6 +1,9 @@
#!/usr/bin/python
Import ('env')
-source = 'winblender.rcscons'
+if env['OURPLATFORM'] == 'linuxcross':
+ source = 'linuxcrossblender.rcscons'
+else:
+ source = 'winblender.rcscons'
env.BlenderRes('winresource', source, ['core'], priority=[95])