diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-08-21 18:12:47 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-08-21 18:12:47 +0000 |
| commit | 85fb7e2305fb1444323a0351f3d6fe59c582d205 (patch) | |
| tree | 5328df479baae63745c43a2289bc4375c0188d54 /wiretap/Makefile.nmake | |
| parent | f4047c4b938752a3802aed0bb0e932fb046c9dce (diff) | |
| download | wireshark-85fb7e2305fb1444323a0351f3d6fe59c582d205.tar.gz | |
_MSC_VERs 1400 and greater require manifests. Check against
MSC_VER_REQUIRED when we run mt.exe instead of checking for each
individual MSVC_VARIANT. This fixes the current buildbot test failures
on Windows, which resulted from a missing check for MSVC2008. This
also keeps us from having to mess with a bunch of makefiles when we add
support for new Visual C++ versions.
svn path=/trunk/; revision=26052
Diffstat (limited to 'wiretap/Makefile.nmake')
| -rw-r--r-- | wiretap/Makefile.nmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake index 40dc4820a6..40ebb967ea 100644 --- a/wiretap/Makefile.nmake +++ b/wiretap/Makefile.nmake @@ -36,7 +36,7 @@ wiretap-$(WTAP_VERSION).dll : $(OBJECTS) wtap.def ..\image\wiretap.res /IMPLIB:wiretap-$(WTAP_VERSION).lib \ ..\image\wiretap.res \ $(OBJECTS) $(wiretap_LIBS) -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "wiretap-$(WTAP_VERSION).dll.manifest" -outputresource:wiretap-$(WTAP_VERSION).dll;2 !ENDIF |