From d0e18ed0bae57fc1e742c0b67c40267b2bd545f9 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sat, 10 Aug 2013 12:22:09 -0400 Subject: [PATCH] Debug build fixes. --HG-- extra : rebase_source : 772710f29b5aca5e0e4b7276fcb19b3702450e3f --- AMBuildScript | 1 + core/AMBuilder | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/AMBuildScript b/AMBuildScript index d860a851..8f170527 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -179,6 +179,7 @@ class SM: self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE') self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS') self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE') + self.compiler.AddToListVar('CDEFINES', '_ITERATOR_DEBUG_LEVEL=0') self.compiler.AddToListVar('CXXFLAGS', '/EHsc') self.compiler.AddToListVar('CXXFLAGS', '/GR-') self.compiler.AddToListVar('CFLAGS', '/W3') diff --git a/core/AMBuilder b/core/AMBuilder index 507c45c2..f5760941 100644 --- a/core/AMBuilder +++ b/core/AMBuilder @@ -44,7 +44,10 @@ for i in SM.sdkInfo: except: extension.AddCommand(SymlinkCommand(link, target)) elif AMBuild.target['platform'] == 'windows': - libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib') + if 'DEBUG' in compiler['CDEFINES']: + libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib') + else: + libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib') binary.RebuildIfNewer(libPath) binary['POSTLINKFLAGS'].append(libPath)