aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-20 22:58:51 +1000
committerDavid Walter Seikel2013-04-20 22:58:51 +1000
commitd00b8c8ea63479d4c2b917142912e4bbd5f5d4d2 (patch)
tree5878b848b2be96152d7779e2f0c325cad44a5505
parentRemove more excess vs finding output. (diff)
downloadmeta-impy-d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2.zip
meta-impy-d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2.tar.gz
meta-impy-d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2.tar.bz2
meta-impy-d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2.tar.xz
Revert part of an earlier commit, no need to treat nmake differently for this bit.
-rwxr-xr-xlinden/indra/develop.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 2c974f6..c3e1341 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -572,6 +572,7 @@ class WindowsSetup(PlatformSetup):
572 def cmake_commandline(self, src_dir, build_dir, opts, simple): 572 def cmake_commandline(self, src_dir, build_dir, opts, simple):
573 args = dict( 573 args = dict(
574 dir=src_dir, 574 dir=src_dir,
575 generator=self.gens[self.generator.lower()]['gen'],
575 opts=quote(opts), 576 opts=quote(opts),
576 standalone=self.standalone, 577 standalone=self.standalone,
577 unattended=self.unattended, 578 unattended=self.unattended,
@@ -580,10 +581,7 @@ class WindowsSetup(PlatformSetup):
580 use_vstool='ON' 581 use_vstool='ON'
581 ) 582 )
582 if self.generator == 'nmake': 583 if self.generator == 'nmake':
583 args['generator'] = r'NMake Makefiles'
584 args['use_vstool'] = 'OFF' 584 args['use_vstool'] = 'OFF'
585 else:
586 args['generator'] = self.gens[self.generator.lower()]['gen']
587 if self.using_express: 585 if self.using_express:
588 args['using_express'] = 'ON' 586 args['using_express'] = 'ON'
589 args['use_vstool'] = 'OFF' 587 args['use_vstool'] = 'OFF'