diff options
Diffstat (limited to '')
-rwxr-xr-x | linden/indra/develop.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 76ba0d9..af633b2 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
@@ -532,7 +532,7 @@ class WindowsSetup(PlatformSetup): | |||
532 | value_str = (r'ProductDir') | 532 | value_str = (r'ProductDir') |
533 | reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) | 533 | reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) |
534 | key = _winreg.OpenKey(reg, key_str) | 534 | key = _winreg.OpenKey(reg, key_str) |
535 | value = _winreg.QueryValueEx(key, value_str)[0]+"IDE" | 535 | value = _winreg.QueryValueEx(key, value_str)[0]+"vcpackages" |
536 | print 'Found: %s' % value | 536 | print 'Found: %s' % value |
537 | self.using_express = True | 537 | self.using_express = True |
538 | return value | 538 | return value |
@@ -618,12 +618,8 @@ class WindowsSetup(PlatformSetup): | |||
618 | if environment == '': | 618 | if environment == '': |
619 | print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?" | 619 | print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?" |
620 | else: | 620 | else: |
621 | print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand" | ||
622 | build_dirs=self.build_dirs(); | 621 | build_dirs=self.build_dirs(); |
623 | print >> sys.stderr, "Solution can now be found in:", build_dirs[0] | 622 | return("\"\"%s\\vcbuild\" /useenv %s.sln \"%s|win32\"\"" % (environment, self.project_name, self.build_type)) |
624 | print >> sys.stderr, "Set %s as startup project" % self.project_name | ||
625 | print >> sys.stderr, "Set build target is Release or RelWithDbgInfo" | ||
626 | exit(0) | ||
627 | 623 | ||
628 | if self.generator == 'nmake': | 624 | if self.generator == 'nmake': |
629 | # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds. | 625 | # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds. |