Mercurial > hg > truffle

comparison make/windows/makefiles/sa.make @ 645:c3a720eefe82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003 Summary: Allow Hotspot builds with latest Windows SDK 6.1 on 64bit Windows 2003 Reviewed-by: ohair, tbell, jcoomes
author kvn
date Mon, 16 Mar 2009 15:06:33 -0700
parents b6272ef4a18f
children bd02caa94611
comparison
equal deleted inserted replaced
644:c517646eef23 645:c3a720eefe82
87 87
88 !if "$(BUILDARCH)" == "ia64" 88 !if "$(BUILDARCH)" == "ia64"
89 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 89 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
90 !elseif "$(BUILDARCH)" == "amd64" 90 !elseif "$(BUILDARCH)" == "amd64"
91 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c 91 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
92 !if "$(COMPILER_NAME)" == "VS2005"
92 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line, 93 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
93 # otherwise we get missing __security_check_cookie externals at link time. 94 # otherwise we get missing __security_check_cookie externals at link time.
94 SA_LINK_FLAGS = bufferoverflowU.lib 95 SA_LINK_FLAGS = bufferoverflowU.lib
96 !endif
95 !else 97 !else
96 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c 98 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
97 !endif 99 !endif
98 !if "$(MT)" != "" 100 !if "$(MT)" != ""
99 SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) 101 SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS)