forked from osmocom/wireshark
Add a manifest, so that styled widgets are drawn correcltly. The
"version" field in the manifest is picky about formatting, so setting a custom version in config.nmake (e.g. "0.10.14-test") will probably break the Windows build. svn path=/trunk/; revision=17291
This commit is contained in:
parent
184349063f
commit
ee12c30d2c
|
@ -586,6 +586,7 @@ EXTRA_DIST = \
|
|||
image/eiconcap32.xpm \
|
||||
image/eiconcap48.xpm \
|
||||
image/elogo3d48x48.png \
|
||||
image/ethereal.exe.manifest.in \
|
||||
image/ethereal.ico \
|
||||
image/ethereal.rc.in \
|
||||
image/ethereal48x48-trans.png \
|
||||
|
|
|
@ -4,10 +4,15 @@
|
|||
|
||||
include ..\config.nmake
|
||||
|
||||
ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc
|
||||
ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc ethereal.exe.manifest
|
||||
all : $(ALL_RC)
|
||||
|
||||
ethereal.rc : ethereal.rc.in ..\config.nmake
|
||||
ethereal.exe.manifest: ethereal.exe.manifest.in ..\config.nmake
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< ethereal.exe.manifest.in > $@
|
||||
|
||||
ethereal.rc : ethereal.rc.in ethereal.exe.manifest ..\config.nmake
|
||||
sed -e s/@VERSION@/$(VERSION)/ \
|
||||
-e s/@RC_VERSION@/$(RC_VERSION)/ \
|
||||
< ethereal.rc.in > $@
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity
|
||||
version="@VERSION@.0"
|
||||
processorArchitecture="X86"
|
||||
name="EtherealDevelopmentTeam.Ethereal"
|
||||
type="win32"
|
||||
/>
|
||||
<description>The world's most popular network protocol anlayzer</description>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Microsoft.Windows.Common-Controls"
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="X86"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
</assembly>
|
|
@ -36,3 +36,8 @@ BEGIN
|
|||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#define MANIFEST_RESOURCE_ID 1
|
||||
#define RT_MANIFEST 24
|
||||
|
||||
MANIFEST_RESOURCE_ID RT_MANIFEST "ethereal.exe.manifest"
|
||||
|
|
Loading…
Reference in New Issue