UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debug build fixes.

Browse Source 
--HG--
extra : rebase_source : 772710f29b5aca5e0e4b7276fcb19b3702450e3f
This commit is contained in:
Nicholas Hastings 2013-08-10 12:22:09 -04:00
parent 70952282f0
commit d0e18ed0ba
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AMBuildScript
View File

@ -179,6 +179,7 @@ class SM:
self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE') self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_DEPRECATE')
self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS') self.compiler.AddToListVar('CDEFINES', '_CRT_SECURE_NO_WARNINGS')
self.compiler.AddToListVar('CDEFINES', '_CRT_NONSTDC_NO_DEPRECATE') 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', '/EHsc')
self.compiler.AddToListVar('CXXFLAGS', '/GR-') self.compiler.AddToListVar('CXXFLAGS', '/GR-')
self.compiler.AddToListVar('CFLAGS', '/W3') self.compiler.AddToListVar('CFLAGS', '/W3')

5
core/AMBuilder
View File

@ -44,7 +44,10 @@ for i in SM.sdkInfo:
except: except:
extension.AddCommand(SymlinkCommand(link, target)) extension.AddCommand(SymlinkCommand(link, target))
elif AMBuild.target['platform'] == 'windows': 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.RebuildIfNewer(libPath)
binary['POSTLINKFLAGS'].append(libPath) binary['POSTLINKFLAGS'].append(libPath)