diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-19 19:20:03 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-04-19 19:20:03 +0000 |
| commit | 34b9d5666b9c92d0954e27a80a2482298ea0248c (patch) | |
| tree | ddacaf47ffd02321441636f7faaab542a33f9110 /config.nmake | |
| parent | 08bc614010d0e1b2a8286eeb46e30036686073bf (diff) | |
Explicitly add /GS to CFLAGS and /SafeSEH & /FIXED:no to LDFLAGS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36722 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 54d1a0333b..1edc40ad8b 100644 --- a/config.nmake +++ b/config.nmake @@ -846,13 +846,20 @@ DLL_LDFLAGS = DLL_LDFLAGS = /MANIFEST:no !ENDIF +# Enable Safe Exception Handler. +# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx +!IF $(MSC_VER_REQUIRED) >= 1300 +LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS +LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH +!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() +# DEP (/NXCompat) is handled in init_process_policies() via SetProcessDEPPolicy. # ASLR http://msdn.microsoft.com/en-us/library/bb384887.aspx !IF $(MSC_VER_REQUIRED) >= 1500 -LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE +LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /DYNAMICBASE /FIXED:no !ENDIF PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) |