1.1 --- a/AMBuildScript	Thu Aug 08 22:02:42 2013 -0700
     1.2 +++ b/AMBuildScript	Sat Aug 10 12:22:09 2013 -0400
     1.3 @@ -179,6 +179,7 @@
     1.4  				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
     1.5  				self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
     1.6  				self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE')
     1.7 +				self.compiler.AddToListVar('CDEFINES', '_ITERATOR_DEBUG_LEVEL=0')
     1.8  				self.compiler.AddToListVar('CXXFLAGS', '/EHsc')
     1.9  				self.compiler.AddToListVar('CXXFLAGS', '/GR-')
    1.10  				self.compiler.AddToListVar('CFLAGS', '/W3')

     2.1 --- a/core/AMBuilder	Thu Aug 08 22:02:42 2013 -0700
     2.2 +++ b/core/AMBuilder	Sat Aug 10 12:22:09 2013 -0400
     2.3 @@ -44,7 +44,10 @@
     2.4  			except:
     2.5  				extension.AddCommand(SymlinkCommand(link, target))
     2.6  		elif AMBuild.target['platform'] == 'windows':
     2.7 -			libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
     2.8 +			if 'DEBUG' in compiler['CDEFINES']:
     2.9 +				libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'debug', 'vs2010', 'libprotobuf.lib')
    2.10 +			else:
    2.11 +				libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
    2.12  			binary.RebuildIfNewer(libPath)
    2.13  			binary['POSTLINKFLAGS'].append(libPath)
    2.14