diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-04-22 19:35:47 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-04-22 19:35:47 +0000 |
| commit | 0303dfbf9f0a474eb6f29054a9a13e28771bda62 (patch) | |
| tree | 49f48e7468973ee831abde91cff7444d21b8c63f /config.nmake | |
| parent | 0d7425872e7ee9c271dbad312a8add82e5c58254 (diff) | |
| download | wireshark-0303dfbf9f0a474eb6f29054a9a13e28771bda62.tar.gz | |
Manifests are not needed when building with VC10.
So: don't run mt program ("manifest-tool") when building Wireshark & etc with VC10.
See: http://msdn.microsoft.com/en-us/library/dd293574.aspx
svn path=/trunk/; revision=32540
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config.nmake b/config.nmake index eee8bf4a81..f285eb1921 100644 --- a/config.nmake +++ b/config.nmake @@ -691,6 +691,12 @@ MSC_VER_REQUIRED=1600 !ERROR MSVC_VARIANT unknown !ENDIF +## Manifest processing is not needed for VC10 (Visual Studio 2010 C) +## See: http://msdn.microsoft.com/en-us/library/dd293574.aspx +!IF ($(MSC_VER_REQUIRED) >= 1400) && ($(MSC_VER_REQUIRED) < 1600) +MANIFEST_INFO_REQUIRED=1 +!ENDIF + # Compiler flags: # /W3 warning level 3 (0 less - 4 most, 1 default) # /Zi create .pdb file for debugging @@ -736,7 +742,7 @@ LOCAL_CFLAGS= $(LOCAL_CFLAGS) /MP # LOCAL_LDFLAGS=/DEBUG /MACHINE:$(TARGET_MACHINE) DLL_LDFLAGS = -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED DLL_LDFLAGS = /MANIFEST:no !ENDIF |