diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2009-02-04 21:31:34 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2009-02-04 21:31:34 +0000 |
| commit | b0ceb7cf9316077647ee0675bebb0a92d07bd2b7 (patch) | |
| tree | 5aac824625d99e858dcfe17e08f0537abb72b5e9 /packaging | |
| parent | 33763b7a532cd87cf584c54b88dbfd7e7a3a0de5 (diff) | |
| download | wireshark-b0ceb7cf9316077647ee0675bebb0a92d07bd2b7.tar.gz | |
fix the buildbot: linking u3util.exe won't create a manifest file, so don't try to include it
svn path=/trunk/; revision=27368
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 7 |
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 |