diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-16 19:20:06 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-16 19:20:06 +0000 |
| commit | e44e7544c6768f4aca88b4d81ab5fdd8f1578fdc (patch) | |
| tree | c9bf130aae742b288f2617e5d9f61a4dac4dc245 /config.nmake | |
| parent | f5e36d54075275fe27fbd2fcb0730e55c5d20785 (diff) | |
Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34137 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index eaa3eced3b..f6e7885fe8 100644 --- a/config.nmake +++ b/config.nmake @@ -780,6 +780,7 @@ LOCAL_CFLAGS=$(LOCAL_CFLAGS) /D_BIND_TO_CURRENT_CRT_VERSION=1 !IF "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" || "$(MSVC_VARIANT)" == "MSVC2010" || "$(MSVC_VARIANT)" == "MSVC2010EE" LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP !ENDIF + # Linker flags: # /DEBUG generate debug info # /PROFILE generate map file(s) for profiling @@ -792,6 +793,15 @@ DLL_LDFLAGS = DLL_LDFLAGS = /MANIFEST:no !ENDIF +# Enable ASLR. Requires VS2008 or later. +# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx +# DEP is handled in init_process_policies() + +# ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx +!IF $(MSC_VER_REQUIRED) >= 1500 +LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE +!ENDIF + PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) # |