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:
authorNathan Letwory <nathan@letworyinteractive.com>2012-04-28 12:45:55 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2012-04-28 12:45:55 +0400
commit5d70a6aedfa246e6a6ac137cdc2be088950b7875 (patch)
treeb2eab6a912bd28917fe1488c2884a4e6e8c03bd9
parent3cceab304aaee5e5f11f224b39960f0c58f68727 (diff)
Add MingW as "platform"
-rw-r--r--build_files/buildbot/master_unpack.py3
-rw-r--r--build_files/scons/tools/btools.py8
2 files changed, 9 insertions, 2 deletions
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 3df22ad8745..f67bd294496 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -48,7 +48,8 @@ def get_platform(filename):
tokens = filename.split("-")
platforms = ('osx', 'mac', 'bsd',
'win', 'linux', 'source',
- 'solaris')
+ 'solaris',
+ 'mingw')
platform_tokens = []
found = False
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index efc80fcd3c5..c9d31d75e18 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -622,7 +622,13 @@ def buildslave(target=None, source=None, env=None):
else:
extension = '.tar.bz2'
- platform = env['OURPLATFORM'].split('-')[0]
+ if env['OURPLATFORM'] == 'win32-mingw':
+ platform = 'mingw32'
+ elif env['OURPLATFORM'] == 'win32-mingw':
+ platform = 'mingw64'
+ else:
+ platform = env['OURPLATFORM'].split('-')[0]
+
if platform == 'linux':
import platform