osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Look for Qt in WIRESHARK_LIB_DIR. Add a conditional check for qmake. 

svn path=/trunk/; revision=52556
This commit is contained in:
Gerald Combs 2013-10-11 23:52:19 +00:00
parent c01ab40cde
commit 383ed6465a
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.nmake
View File

@ -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

10
config.nmake
View File

@ -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