From 24e3176f1b7446b6fb206d3a2cce5a32262eae76 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 22 Aug 2014 03:38:49 -0500 Subject: [PATCH] Fixed some odd initialization oddness in develop.py. Also changed win64 build targetdir to build-vc###-Win64 --- indra/develop.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/develop.py b/indra/develop.py index 0c732cc02..024bd92cb 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -221,6 +221,7 @@ class UnixSetup(PlatformSetup): exe_suffixes = ('',) def __init__(self): + PlatformSetup.__init__(self) super(UnixSetup, self).__init__() self.generator = 'Unix Makefiles' @@ -263,6 +264,7 @@ class UnixSetup(PlatformSetup): class LinuxSetup(UnixSetup): def __init__(self): + UnixSetup.__init__(self) super(LinuxSetup, self).__init__() try: self.debian_sarge = open('/etc/debian_version').read().strip() == '3.1' @@ -384,6 +386,7 @@ class LinuxSetup(UnixSetup): class DarwinSetup(UnixSetup): def __init__(self): + UnixSetup.__init__(self) super(DarwinSetup, self).__init__() self.generator = 'Xcode' @@ -457,6 +460,7 @@ class WindowsSetup(PlatformSetup): exe_suffixes = ('.exe', '.bat', '.com') def __init__(self): + PlatformSetup.__init__(self) super(WindowsSetup, self).__init__() self._generator = None self.incredibuild = False @@ -497,7 +501,10 @@ class WindowsSetup(PlatformSetup): return 'win32' def build_dirs(self): - return ['build-' + self.generator] + if self.word_size == 64: + return ['build-' + self.generator + '-Win64'] + else: + return ['build-' + self.generator] def cmake_commandline(self, src_dir, build_dir, opts, simple): args = dict(