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 /epan/Makefile.nmake | |
| parent | 0d7425872e7ee9c271dbad312a8add82e5c58254 (diff) | |
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 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index af94e5b63c..6db84ef56e 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -227,7 +227,7 @@ exntest.exe: $(EXNTEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(EXNTEST_OBJ) -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF @@ -243,7 +243,7 @@ tvbtest.exe: $(TVBTEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ) -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF @@ -260,7 +260,7 @@ reassemble_test.exe: $(REASSEMBLE_TEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ) -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF |