aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2009-02-04 21:31:34 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2009-02-04 21:31:34 +0000
commit8a2ac43a5684d067e5eb0381fd361088c1578f3b (patch)
tree5aac824625d99e858dcfe17e08f0537abb72b5e9 /packaging
parent909c6ff8191104233b67d42598c3289b499cd4c4 (diff)
fix the buildbot: linking u3util.exe won't create a manifest file, so don't try to include it
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27368 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
-rw-r--r--packaging/u3/win32/makefile.nmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index 8e0e2e31ea..3ab90b882d 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -105,9 +105,10 @@ u3util_LIBS= user32.lib shell32.lib
u3util.exe: u3util.obj
@echo Linking $@
$(LINK) /OUT:u3util.exe $(guiflags) $(LDFLAGS) u3util.obj $(u3util_LIBS) $(guilibsdll)
-!IF $(MSC_VER_REQUIRED) >= 1400
- mt.exe -nologo -manifest "u3util.exe.manifest" -outputresource:u3util.exe;1
-!ENDIF
+# the u3util.exe don't create a manifest file, maybe because only windows (no WS specific) libs are used
+#!IF $(MSC_VER_REQUIRED) >= 1400
+# mt.exe -nologo -manifest "u3util.exe.manifest" -outputresource:u3util.exe;1
+#!ENDIF
clean:
cd ../tools