diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-11-01 17:02:39 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-11-01 17:02:39 +0000 |
| commit | 16b27ad924168718a7216f42dde71e6322731ddb (patch) | |
| tree | 46d16d27ad7421bfe807458ed80223869886dc84 /image/Makefile.nmake | |
| parent | 5217ec489f6ff381931c8c49766593f6cff5fcfd (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9298 :
Update manifest file so as to identify Windows 8.1 properly (see http://msdn.microsoft.com/en-us/library/windows/desktop/dn302074.aspx for details)
Use manifest file to build tshark, rawshark and dumpcap
svn path=/trunk/; revision=53024
Diffstat (limited to 'image/Makefile.nmake')
| -rw-r--r-- | image/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 1746edc404..59af328960 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -26,12 +26,12 @@ libwireshark.rc: libwireshark.rc.in ..\config.nmake -e s/@RC_VERSION@/$(RC_VERSION)/ \ < libwireshark.rc.in > $@ -tshark.rc : tshark.rc.in ..\config.nmake +tshark.rc : tshark.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < tshark.rc.in > $@ -rawshark.rc : rawshark.rc.in ..\config.nmake +rawshark.rc : rawshark.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < rawshark.rc.in > $@ @@ -71,7 +71,7 @@ libwsutil.rc : libwsutil.rc.in ..\config.nmake -e s/@RC_VERSION@/$(RC_VERSION)/ \ < libwsutil.rc.in > $@ -dumpcap.rc : dumpcap.rc.in ..\config.nmake +dumpcap.rc : dumpcap.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < dumpcap.rc.in > $@ |