osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Only add /SafeSEH to LDFLAGS if WIRESHARK_TARGET_PLATFORM != win64. The 

Windows-7-x64 buildbot doesn't like it and reports the following:
LINK : fatal error LNK1246: '/SAFESEH' not compatible with 'x64' target machine; link without '/SAFESEH'

svn path=/trunk/; revision=36730
This commit is contained in:
Chris Maynard 2011-04-20 05:21:32 +00:00
parent 05e06f7a7a
commit be832727cd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.nmake
View File

@ -850,8 +850,10 @@ DLL_LDFLAGS = /MANIFEST:no
# http://msdn.microsoft.com/en-us/magazine/cc337897.aspx
!IF $(MSC_VER_REQUIRED) >= 1300
LOCAL_CFLAGS= $(LOCAL_CFLAGS) /GS
!IF "$(WIRESHARK_TARGET_PLATFORM)" != "win64"
LOCAL_LDFLAGS= $(LOCAL_LDFLAGS) /SafeSEH
!ENDIF
!ENDIF
# Enable ASLR. Requires VS2008 or later.
# http://blogs.msdn.com/b/vcblog/archive/2009/05/21/dynamicbase-and-nxcompat.aspx