diff options
Diffstat (limited to '')
-rwxr-xr-x | linden/indra/develop.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 8d432fc..7e7350e 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
@@ -460,11 +460,16 @@ class WindowsSetup(PlatformSetup): | |||
460 | 'vc90' : { | 460 | 'vc90' : { |
461 | 'gen' : r'Visual Studio 9 2008', | 461 | 'gen' : r'Visual Studio 9 2008', |
462 | 'ver' : r'9.0' | 462 | 'ver' : r'9.0' |
463 | }, | ||
464 | 'vc100' : { | ||
465 | 'gen' : r'Visual Studio 10', | ||
466 | 'ver' : r'10.0' | ||
463 | } | 467 | } |
464 | } | 468 | } |
465 | gens['vs2003'] = gens['vc71'] | 469 | gens['vs2003'] = gens['vc71'] |
466 | gens['vs2005'] = gens['vc80'] | 470 | gens['vs2005'] = gens['vc80'] |
467 | gens['vs2008'] = gens['vc90'] | 471 | gens['vs2008'] = gens['vc90'] |
472 | gens['vs2010'] = gens['vc100'] | ||
468 | 473 | ||
469 | search_path = r'C:\windows' | 474 | search_path = r'C:\windows' |
470 | exe_suffixes = ('.exe', '.bat', '.com') | 475 | exe_suffixes = ('.exe', '.bat', '.com') |
@@ -476,14 +481,14 @@ class WindowsSetup(PlatformSetup): | |||
476 | 481 | ||
477 | def _get_generator(self): | 482 | def _get_generator(self): |
478 | if self._generator is None: | 483 | if self._generator is None: |
479 | for version in 'vc80 vc90 vc71'.split(): | 484 | for version in 'vc80 vc90 vc100 vc71'.split(): |
480 | if self.find_visual_studio(version): | 485 | if self.find_visual_studio(version): |
481 | self._generator = version | 486 | self._generator = version |
482 | print 'Building with ', self.gens[version]['gen'] | 487 | print 'Building with ', self.gens[version]['gen'] |
483 | break | 488 | break |
484 | else: | 489 | else: |
485 | print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions' | 490 | print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions' |
486 | for version in 'vc80 vc90 vc71'.split(): | 491 | for version in 'vc80 vc90 vc100 vc71'.split(): |
487 | if self.find_visual_studio_express(version): | 492 | if self.find_visual_studio_express(version): |
488 | self._generator = version | 493 | self._generator = version |
489 | print 'Building with ', self.gens[version]['gen'] , "Express edition" | 494 | print 'Building with ', self.gens[version]['gen'] , "Express edition" |