From 56ddeb6b85dcae964d2390751f110f3dc2ff8e0e Mon Sep 17 00:00:00 2001
From: Ulf Lamping <ulf.lamping@web.de>
Date: Sun, 6 May 2007 09:24:36 +0000
Subject: [PATCH] embed the manifest files for the unittest exe's as well

svn path=/trunk/; revision=21697
---
 epan/Makefile.nmake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 96229c5cde..51de3f6fdd 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -202,11 +202,17 @@ 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" 
+	mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
+!ENDIF
 
 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" 
+	mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
+!ENDIF
 
 reassemble_test.exe: reassemble_test.obj tvbuff.obj except.obj strutil.obj emem.obj \
                  reassemble.obj
@@ -214,21 +220,21 @@ 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" 
+	mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
+!ENDIF
 
 exntest_install:
 	set copycmd=/y
 	if exist exntest.exe          xcopy exntest.exe          $(INSTALL_DIR) /d
-	if exist exntest.exe.manifest xcopy exntest.exe.manifest $(INSTALL_DIR) /d	
 
 tvbtest_install:
 	set copycmd=/y
 	if exist tvbtest.exe          xcopy tvbtest.exe          $(INSTALL_DIR) /d
-	if exist tvbtest.exe.manifest xcopy tvbtest.exe.manifest $(INSTALL_DIR) /d	
 
 reassemble_test_install:
 	set copycmd=/y
 	if exist reassemble_test.exe          xcopy reassemble_test.exe          $(INSTALL_DIR) /d
-	if exist reassemble_test.exe.manifest xcopy reassemble_test.exe.manifest $(INSTALL_DIR) /d	
 
 
 # (Windows only) Copy some sources from /trunk to /trunk/epan.