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/Makefile.nmake | |
| parent | 7d004dc887bcecb404241604242004edb6f6ceaa (diff) | |
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/Makefile.nmake')
| -rw-r--r-- | image/Makefile.nmake | 11 |
1 files changed, 11 insertions, 0 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 : |