diff options
| -rw-r--r-- | Makefile.nmake | 26 | ||||
| -rw-r--r-- | config.nmake | 8 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 6 |
3 files changed, 23 insertions, 17 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a2283081c0..a91008b9af 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -257,7 +257,7 @@ wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) wsgetopt.obj inet_nt $(LINK) @<< /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) wsgetopt.obj inet_ntop.obj inet_pton.obj $(GTK_LIBS) codecs\codecs.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 !ENDIF @@ -266,7 +266,7 @@ tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj $(LINK) @<< /OUT:tshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(tshark_LIBS) $(tshark_OBJECTS) wsgetopt.obj inet_ntop.obj inet_pton.obj image\tshark.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "tshark.exe.manifest" -outputresource:tshark.exe;1 !ENDIF @@ -275,7 +275,7 @@ rawshark.exe : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) wsgetopt.obj inet_ntop $(LINK) @<< /OUT:rawshark.exe $(conflags) $(conlibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console $(rawshark_LIBS) $(rawshark_OBJECTS) wsgetopt.obj inet_ntop.obj image\rawshark.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "rawshark.exe.manifest" -outputresource:rawshark.exe;1 !ENDIF @@ -287,7 +287,7 @@ capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsgetopt.obj wsutil\li $(LINK) @<< /OUT:capinfos.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(capinfos_OBJECTS) wsgetopt.obj $(capinfos_LIBS) setargv.obj image\capinfos.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "capinfos.exe.manifest" -outputresource:capinfos.exe;1 !ENDIF @@ -298,7 +298,7 @@ editcap.exe : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsgetopt.obj strptime.ob $(LINK) @<< /OUT:editcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(editcap_OBJECTS) wsgetopt.obj strptime.obj $(editcap_LIBS) image\editcap.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "editcap.exe.manifest" -outputresource:editcap.exe;1 !ENDIF @@ -308,7 +308,7 @@ mergecap.exe : $(LIBS_CHECK) config.h mergecap.obj merge.obj wsgetopt.obj wsuti $(LINK) @<< /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console mergecap.obj merge.obj wsgetopt.obj $(mergecap_LIBS) setargv.obj image\mergecap.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1 !ENDIF @@ -317,7 +317,7 @@ text2pcap.exe : $(LIBS_CHECK) config.h text2pcap.obj text2pcap-scanner.obj wsget $(LINK) @<< /OUT:text2pcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console text2pcap.obj text2pcap-scanner.obj wsgetopt.obj $(text2pcap_LIBS) strptime.obj image\text2pcap.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "text2pcap.exe.manifest" -outputresource:text2pcap.exe;1 !ENDIF @@ -326,7 +326,7 @@ dftest.exe : $(dftest_OBJECTS) epan $(LINK) @<< /OUT:dftest.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dftest_LIBS) $(dftest_OBJECTS) << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "dftest.exe.manifest" -outputresource:dftest.exe;1 !ENDIF @@ -335,7 +335,7 @@ randpkt.exe : $(randpkt_OBJECTS) wsgetopt.obj $(LINK) @<< /OUT:randpkt.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(randpkt_LIBS) $(randpkt_OBJECTS) wsgetopt.obj << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "randpkt.exe.manifest" -outputresource:randpkt.exe;1 !ENDIF @@ -344,7 +344,7 @@ dumpcap.exe : $(LIBS_CHECK) config.h $(dumpcap_OBJECTS) wsgetopt.obj inet_ntop.o $(LINK) @<< /OUT:dumpcap.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:console $(dumpcap_LIBS) $(dumpcap_OBJECTS) wsgetopt.obj inet_ntop.obj image\dumpcap.res << -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "dumpcap.exe.manifest" -outputresource:dumpcap.exe;1 !ENDIF @@ -603,7 +603,7 @@ $(ADNS_DLL): set CFG=adns_dll - Win32 Release $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="$(LOCAL_CFLAGS)" cd ..\lib -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2 !ENDIF if not exist $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns mkdir $(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns @@ -626,7 +626,7 @@ $(ZLIB_DLL): if not exist $(ZLIB_DIR) mkdir $(ZLIB_DIR) if not exist $(ZLIB_DIR)\lib mkdir $(ZLIB_DIR)\lib if not exist $(ZLIB_DIR)\include mkdir $(ZLIB_DIR)\include -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "zlib1.dll.manifest" -outputresource:zlib1.dll;2 !ENDIF copy zlib1.dll $(ZLIB_DIR) @@ -702,7 +702,7 @@ REQUIRED_TOOLS=\ $(CC) \ $(LINK) \ nmake \ -!IF $(MSC_VER_REQUIRED) >= 1400 +!IFDEF MANIFEST_INFO_REQUIRED mt \ !ENDIF $(SH_PROG) \ 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 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 |