From d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:58:51 +1000
Subject: Revert part of an earlier commit, no need to treat nmake differently
 for this bit.

---
 linden/indra/develop.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'linden')

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):
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         args = dict(
             dir=src_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
@@ -580,10 +581,7 @@ class WindowsSetup(PlatformSetup):
             use_vstool='ON'
             )
         if self.generator == 'nmake':
-           args['generator'] = r'NMake Makefiles'
            args['use_vstool'] = 'OFF'
-        else:
-           args['generator'] = self.gens[self.generator.lower()]['gen']
         if self.using_express:
            args['using_express'] = 'ON'
            args['use_vstool'] = 'OFF'
-- 
cgit v1.1