Updated develop.py to find VS2010 as well (patch by DJ Wind)

author: McCabe Maxsted 2011-09-08 19:05:00 -0700
committer: McCabe Maxsted 2011-09-08 19:05:00 -0700
commit: 345a4f9016837ce6a687ccbda6397801784885a4 (patch)
tree: d8895b5a64fa7b1f5f27e1feef6323f99453a760
parent: Removed old unused stable installer script. Still need to figure out a good w... (diff)
download: meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.zip
meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.gz
meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.bz2
meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 69542da..6d2ce72 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -578,7 +578,7 @@ class WindowsSetup(PlatformSetup):
    def get_build_cmd(self):
        if self.incredibuild:
            config = self.build_type
-            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:
+            if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
                config = '\"%s|Win32\"' % config
            return "buildconsole %s.sln /build %s" % (self.project_name, config)
@@ -702,8 +702,8 @@ Options:
  -m32 | -m64           build architecture (32-bit or 64-bit)
  -N | --no-distcc      disable use of distcc
  -G | --generator=NAME generator name
-                        Windows: VC71 or VS2003 (default), VC80 (VS2005) or 
+                        Windows: VC80 (VS2005--default), VC71 (VS2003), 
-                          VC90 (VS2008)
+                          VC90 (VS2008), or VC100 (VS2010)
                        Mac OS X: Xcode (default), Unix Makefiles
                        Linux: Unix Makefiles (default), KDevelop3
  -p | --project=NAME   set the root project name. (Doesn't effect makefiles)
author	McCabe Maxsted	2011-09-08 19:05:00 -0700
committer	McCabe Maxsted	2011-09-08 19:05:00 -0700
commit	345a4f9016837ce6a687ccbda6397801784885a4 (patch)
tree	d8895b5a64fa7b1f5f27e1feef6323f99453a760
parent	Removed old unused stable installer script. Still need to figure out a good w... (diff)
download	meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.zip meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.gz meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.bz2 meta-impy-345a4f9016837ce6a687ccbda6397801784885a4.tar.xz

diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 69542da..6d2ce72 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py
@@ -578,7 +578,7 @@ class WindowsSetup(PlatformSetup):
578	def get_build_cmd(self):	578	def get_build_cmd(self):
579	if self.incredibuild:	579	if self.incredibuild:
580	config = self.build_type	580	config = self.build_type
581	if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0' ]:	581	if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
582	config = '\"%s\|Win32\"' % config	582	config = '\"%s\|Win32\"' % config
583		583
584	return "buildconsole %s.sln /build %s" % (self.project_name, config)	584	return "buildconsole %s.sln /build %s" % (self.project_name, config)
@@ -702,8 +702,8 @@ Options:
702	-m32 \| -m64 build architecture (32-bit or 64-bit)	702	-m32 \| -m64 build architecture (32-bit or 64-bit)
703	-N \| --no-distcc disable use of distcc	703	-N \| --no-distcc disable use of distcc
704	-G \| --generator=NAME generator name	704	-G \| --generator=NAME generator name
705	Windows: VC71 or VS2003 (default), VC80 (VS2005) or	705	Windows: VC80 (VS2005--default), VC71 (VS2003),
706	VC90 (VS2008)	706	VC90 (VS2008), or VC100 (VS2010)
707	Mac OS X: Xcode (default), Unix Makefiles	707	Mac OS X: Xcode (default), Unix Makefiles
708	Linux: Unix Makefiles (default), KDevelop3	708	Linux: Unix Makefiles (default), KDevelop3
709	-p \| --project=NAME set the root project name. (Doesn't effect makefiles)	709	-p \| --project=NAME set the root project name. (Doesn't effect makefiles)