Mercurial > hg > truffle
comparison make/windows/makefiles/sa.make @ 15280:417e2ae45b89
Merge
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Tue, 22 Apr 2014 18:22:40 -0700 |
parents | 4ca6dc0799b6 |
children | 89152779163c |
comparison
equal
deleted
inserted
replaced
15279:0c6d8a08e31b | 15280:417e2ae45b89 |
---|---|
1 # | 1 # |
2 # Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, | 92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, |
93 # otherwise we get missing __security_check_cookie externals at link time. | 93 # otherwise we get missing __security_check_cookie externals at link time. |
94 SA_LD_FLAGS = bufferoverflowU.lib | 94 SA_LD_FLAGS = bufferoverflowU.lib |
95 !endif | 95 !endif |
96 !else | 96 !else |
97 SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -FD -RTC1 -c | 97 SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c |
98 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" | 98 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" |
99 SA_CFLAGS = $(SA_CFLAGS) -ZI | 99 SA_CFLAGS = $(SA_CFLAGS) -ZI |
100 !endif | 100 !endif |
101 !endif | 101 !endif |
102 !if "$(MT)" != "" | 102 !if "$(MT)" != "" |