summaryrefslogtreecommitdiff
path: root/wiretap/Makefile.nmake
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2007-05-06 09:17:19 +0000
committerUlf Lamping <ulf.lamping@web.de>2007-05-06 09:17:19 +0000
commit0abc3ba9790b06100b0a3c4b855024e1c41aef6b (patch)
treeb293a2cabd5661edddf9814399883150377ce46a /wiretap/Makefile.nmake
parent2e96e3fe550c1f350a5b2e93bcc6afe321bcb9db (diff)
downloadwireshark-0abc3ba9790b06100b0a3c4b855024e1c41aef6b.tar.gz
instead of copying the MSVC 2005 manifest files around, embed them into the .exe / .dll files - this way is easier to handle while packaging and alike, and probably will solve some problems. We might want to do this for the plugins as well later.
svn path=/trunk/; revision=21696
Diffstat (limited to 'wiretap/Makefile.nmake')
-rw-r--r--wiretap/Makefile.nmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 97423175bb..78564f68dd 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -35,6 +35,9 @@ 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"
+ mt.exe -nologo -manifest "wiretap-$(WTAP_VERSION).dll.manifest" -outputresource:wiretap-$(WTAP_VERSION).dll;1
+!ENDIF
$(OBJECTS): config.h