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 | |
| parent | c01ab40cdee180b99cebc2f4153b3bf983d3818b (diff) | |
Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake.
svn path=/trunk/; revision=52556
| -rw-r--r-- | Makefile.nmake | 6 | ||||
| -rw-r--r-- | config.nmake | 10 |
2 files changed, 16 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 diff --git a/config.nmake b/config.nmake index 65eda43b80..d938cf59a3 100644 --- a/config.nmake +++ b/config.nmake @@ -308,10 +308,15 @@ GTK_INST_VERSION=3.4 # #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX" !IF !DEFINED(QT_DIR) +# Wireshark custom !IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws) QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws +# Digia official !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 +# Digia official, installed in $(WIRESHARK_LIB_DIR) +!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) +QT_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 !ENDIF !ENDIF @@ -548,10 +553,15 @@ GTK_INST_VERSION=3.4 # #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX" !IF !DEFINED(QT_DIR) +# Wireshark custom !IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws) QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws +# Digia official !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 +# Digia official, installed in $(WIRESHARK_LIB_DIR) +!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010) +QT_DIR=$(WIRESHARK_LIB_DIR)\Qt5.1.1\5.1.1\msvc2010 !ENDIF !ENDIF |