# HG changeset patch # User Nicholas Hastings # Date 1376151729 14400 # Node ID af3681eade3ffa6219aa910987f013ee4582fc29 # Parent dc7dfcd855dcfb4ca9ea001d5433012a4cccb93b Debug build fixes. diff -r dc7dfcd855dc -r af3681eade3f AMBuildScript --- a/AMBuildScript Thu Aug 08 22:02:42 2013 -0700 +++ b/AMBuildScript Sat Aug 10 12:22:09 2013 -0400 @@ -179,6 +179,7 @@ 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 -r dc7dfcd855dc -r af3681eade3f core/AMBuilder --- a/core/AMBuilder Thu Aug 08 22:02:42 2013 -0700 +++ b/core/AMBuilder Sat Aug 10 12:22:09 2013 -0400 @@ -44,7 +44,10 @@ 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)