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 /epan/Makefile.nmake | |
| parent | f4047c4b938752a3802aed0bb0e932fb046c9dce (diff) | |
_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 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 33b194e41b..fe39cadac6 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -93,7 +93,7 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crypt fty $(libwireshark_LIBS) ..\image\libwireshark.res \ dissectors\register.obj \ $(EXTRA_OBJECTS) -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "libwireshark.dll.manifest" -outputresource:libwireshark.dll;2 !ENDIF @@ -221,7 +221,7 @@ exntest.exe: exntest.obj except.obj @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) exntest.obj except.obj -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF @@ -229,7 +229,7 @@ tvbtest.exe: tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(ZLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF @@ -239,7 +239,7 @@ reassemble_test.exe: reassemble_test.obj tvbuff.obj except.obj strutil.obj emem. $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(ZLIB_LIBS) reassemble_test.obj tvbuff.obj \ except.obj strutil.obj emem.obj reassemble.obj -!IF "$(MSVC_VARIANT)" == "MSVC2005" || "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" +!IF $(MSC_VER_REQUIRED) >= 1400 mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF |