diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-05-06 09:17:19 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-05-06 09:17:19 +0000 |
| commit | 0abc3ba9790b06100b0a3c4b855024e1c41aef6b (patch) | |
| tree | b293a2cabd5661edddf9814399883150377ce46a /epan/Makefile.nmake | |
| parent | 2e96e3fe550c1f350a5b2e93bcc6afe321bcb9db (diff) | |
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 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 44d30e00a5..96229c5cde 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -83,6 +83,10 @@ 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" + mt.exe -nologo -manifest "libwireshark.dll.manifest" -outputresource:libwireshark.dll;1 +!ENDIF + libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter $(WSLUA_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib $(WSLUA_LIB) dissectors\dissectors.lib |