diff options
author | McCabe Maxsted | 2010-01-09 09:13:14 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-01-09 09:14:11 -0700 |
commit | d744b13b174595be7bd5eab748b2201d54f7d036 (patch) | |
tree | ac868fe953f2e03eac3cfc0dac7386f50554d886 /linden/indra/develop.py | |
parent | Fixed options missing from Text Chat and Input & Camera preferences (see VWR-... (diff) | |
download | meta-impy-d744b13b174595be7bd5eab748b2201d54f7d036.zip meta-impy-d744b13b174595be7bd5eab748b2201d54f7d036.tar.gz meta-impy-d744b13b174595be7bd5eab748b2201d54f7d036.tar.bz2 meta-impy-d744b13b174595be7bd5eab748b2201d54f7d036.tar.xz |
Fixed viewer_manifest.py and default packaging system for Windows (NSIS install script only works manually)
Diffstat (limited to 'linden/indra/develop.py')
-rwxr-xr-x | linden/indra/develop.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 8ea435c..31dcb6a 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
@@ -520,12 +520,14 @@ class WindowsSetup(PlatformSetup): | |||
520 | unattended=self.unattended, | 520 | unattended=self.unattended, |
521 | project_name=self.project_name | 521 | project_name=self.project_name |
522 | ) | 522 | ) |
523 | #if simple: | 523 | # default to packaging enabled |
524 | # if simple: | ||
524 | # return 'cmake %(opts)s "%(dir)s"' % args | 525 | # return 'cmake %(opts)s "%(dir)s"' % args |
525 | return ('cmake -G "%(generator)s" ' | 526 | return ('cmake -G "%(generator)s" ' |
526 | '-DSTANDALONE:BOOL=%(standalone)s ' | 527 | '-DSTANDALONE:BOOL=%(standalone)s ' |
527 | '-DUNATTENDED:BOOL=%(unattended)s ' | 528 | '-DUNATTENDED:BOOL=%(unattended)s ' |
528 | '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' | 529 | '-DROOT_PROJECT_NAME:STRING=%(project_name)s ' |
530 | '-DPACKAGE:BOOL=ON ' | ||
529 | '%(opts)s "%(dir)s"' % args) | 531 | '%(opts)s "%(dir)s"' % args) |
530 | 532 | ||
531 | def find_visual_studio(self, gen=None): | 533 | def find_visual_studio(self, gen=None): |