diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-11 23:52:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-11 23:52:19 +0000 |
| commit | 383ed6465ac88d7e09e376596ac0bbf5ff758576 (patch) | |
| tree | 3e005eb95d7cfe3eb9273e20c55c8b7fdc926065 /Makefile.nmake | |
| parent | c01ab40cdee180b99cebc2f4153b3bf983d3818b (diff) | |
Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.
svn path=/trunk/; revision=52556
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 4ee354b716..edf2b4c8f9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -858,6 +858,9 @@ REQUIRED_TOOLS=\ peflags \ $(PERL) \ $(PYTHON) \ +!IFDEF QT_DIR + --windowsonly $(QT_DIR)\bin\qmake \ +!ENDIF sed \ unzip \ wget @@ -914,6 +917,9 @@ process_libs: @if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)" @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . WinPcap_$(PCAP_VERSION).exe +!IFNDEF QT_DIR +!MESSAGE Can't find Qt. This will become a problem at some point. +!ENDIF !IFDEF GTK_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ "$(GTK_NAME)" gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip |