diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-02-01 21:47:31 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-02-01 21:47:31 +0000 |
| commit | 781d224ada9ccb39cbb78bd697b8368fbf1e57c0 (patch) | |
| tree | 1766cd808d251eff203be6a26cfe1eff27f8d922 /Makefile.nmake | |
| parent | ba65ed5dd56176495edade92ae1850be46bec4f0 (diff) | |
| download | wireshark-781d224ada9ccb39cbb78bd697b8368fbf1e57c0.tar.gz wireshark-781d224ada9ccb39cbb78bd697b8368fbf1e57c0.tar.bz2 wireshark-781d224ada9ccb39cbb78bd697b8368fbf1e57c0.zip | |
Fix some Windows qmake and Qt Wireshark build issues:
If 'MANIFEST_INFO_REQUIRED' not defined in config.nmake, don't do 'mt ...' for Wireshark Qt;
Add '*.pdb' to QMAKE_CLEAN;
Fix 'Unescaped backslashes are deprecated' qmake warnings;
Remove "debug" message() statements from QtShark.pro.
svn path=/trunk/; revision=40797
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index e7137170c9..d801b9c4d8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -404,6 +404,9 @@ ui\qt\config.pri: config.nmake Makefile.nmake @echo Creating <<ui\qt\config.pri # Automatically generated from Makefile.nmake. Edit there, not here. VERSION = $(VERSION) +!IFDEF MANIFEST_INFO_REQUIRED +CONFIG += wireshark_manifest_info_required +!ENDIF WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR:\=/) GLIB_DIR = $(GTK_DIR:\=/) C_ARES_DIR = $(C_ARES_DIR:\=/) |