aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--image/Makefile.nmake9
-rwxr-xr-ximage/ethereal.exe.manifest.in22
-rw-r--r--image/ethereal.rc.in5
4 files changed, 35 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 33d6f693e2..45544e7c6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index d7eee52cc1..c9689912c1 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -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 > $@
diff --git a/image/ethereal.exe.manifest.in b/image/ethereal.exe.manifest.in
new file mode 100755
index 0000000000..a64d5a50d6
--- /dev/null
+++ b/image/ethereal.exe.manifest.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>
diff --git a/image/ethereal.rc.in b/image/ethereal.rc.in
index 65b0cc616f..adb9401a48 100644
--- a/image/ethereal.rc.in
+++ b/image/ethereal.rc.in
@@ -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"