diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-10 21:29:57 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-11 20:22:32 +0000 |
| commit | 528a8572582116a93e660ca93cdee36809b13b96 (patch) | |
| tree | 250159b9a9000773d870b10bfa65726d9ed04e13 /image | |
| parent | 7d004dc887bcecb404241604242004edb6f6ceaa (diff) | |
| download | wireshark-528a8572582116a93e660ca93cdee36809b13b96.tar.gz | |
Fix CMake generation and use of Windows .rc files
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.
The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake. The path is removed for nmake builds.
Updated build architecture detection, required for wireshark.manifest.in
Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'image')
| -rw-r--r-- | image/Makefile.nmake | 11 | ||||
| -rw-r--r-- | image/capinfos.rc.in | 2 | ||||
| -rw-r--r-- | image/captype.rc.in | 2 | ||||
| -rw-r--r-- | image/dumpcap.rc.in | 2 | ||||
| -rw-r--r-- | image/editcap.rc.in | 2 | ||||
| -rw-r--r-- | image/mergecap.rc.in | 2 | ||||
| -rw-r--r-- | image/rawshark.rc.in | 2 | ||||
| -rw-r--r-- | image/reordercap.rc.in | 2 | ||||
| -rw-r--r-- | image/text2pcap.rc.in | 2 | ||||
| -rw-r--r-- | image/tfshark.rc.in | 2 | ||||
| -rw-r--r-- | image/tshark.rc.in | 2 | ||||
| -rw-r--r-- | image/wireshark.rc.in | 4 |
12 files changed, 23 insertions, 12 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index de5c615b16..d7910e651a 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -18,6 +18,7 @@ wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake wireshark.rc : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < wireshark.rc.in > $@ libwireshark.rc: libwireshark.rc.in ..\config.nmake @@ -28,46 +29,55 @@ libwireshark.rc: libwireshark.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)/ \ + -e s/@ICON_PATH@// \ < tshark.rc.in > $@ tfshark.rc : tfshark.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < tfshark.rc.in > $@ rawshark.rc : rawshark.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < rawshark.rc.in > $@ capinfos.rc : capinfos.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < capinfos.rc.in > $@ captype.rc : captype.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < captype.rc.in > $@ editcap.rc : editcap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < editcap.rc.in > $@ mergecap.rc : mergecap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < mergecap.rc.in > $@ reordercap.rc : reordercap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < reordercap.rc.in > $@ text2pcap.rc : text2pcap.rc.in ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ + -e s/@ICON_PATH@// \ < text2pcap.rc.in > $@ wiretap.rc : wiretap.rc.in ..\config.nmake @@ -83,6 +93,7 @@ libwsutil.rc : libwsutil.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)/ \ + -e s/@ICON_PATH@// \ < dumpcap.rc.in > $@ clean : diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in index d4b764f24b..947dc39c8a 100644 --- a/image/capinfos.rc.in +++ b/image/capinfos.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/captype.rc.in b/image/captype.rc.in index 631732790f..f53b61e08e 100644 --- a/image/captype.rc.in +++ b/image/captype.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in index d3a7e71e5f..459730c39f 100644 --- a/image/dumpcap.rc.in +++ b/image/dumpcap.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/editcap.rc.in b/image/editcap.rc.in index b4fdd1f6dd..8c9bc6251b 100644 --- a/image/editcap.rc.in +++ b/image/editcap.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in index e40e37ec10..46b595b2a4 100644 --- a/image/mergecap.rc.in +++ b/image/mergecap.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/rawshark.rc.in b/image/rawshark.rc.in index 47afa8517a..314f98a173 100644 --- a/image/rawshark.rc.in +++ b/image/rawshark.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/reordercap.rc.in b/image/reordercap.rc.in index 968c6c56ab..6a7889ebc6 100644 --- a/image/reordercap.rc.in +++ b/image/reordercap.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/text2pcap.rc.in b/image/text2pcap.rc.in index b62624a7ec..0bf2e20f91 100644 --- a/image/text2pcap.rc.in +++ b/image/text2pcap.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/tfshark.rc.in b/image/tfshark.rc.in index 7e0fb13e30..d2b1a9d66c 100644 --- a/image/tfshark.rc.in +++ b/image/tfshark.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/tshark.rc.in b/image/tshark.rc.in index 7e61e6fd06..72eb551aed 100644 --- a/image/tshark.rc.in +++ b/image/tshark.rc.in @@ -1,6 +1,6 @@ #include "winver.h" -WIRESHARK_ICON ICON "wireshark.ico" +WIRESHARK_ICON ICON "@ICON_PATH@wireshark.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ diff --git a/image/wireshark.rc.in b/image/wireshark.rc.in index a2b61e2b4d..bd181c76b7 100644 --- a/image/wireshark.rc.in +++ b/image/wireshark.rc.in @@ -1,7 +1,7 @@ #include "winver.h" -WIRESHARK_ICON1 ICON "wireshark.ico" -WIRESHARK_ICON2 ICON "wiresharkdoc.ico" +WIRESHARK_ICON1 ICON "@ICON_PATH@wireshark.ico" +WIRESHARK_ICON2 ICON "@ICON_PATH@wiresharkdoc.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @RC_VERSION@ |