diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-10 23:52:29 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-10 23:52:29 +0000 |
| commit | 2f067f20ddac4eef6b386a886f703d0a9a6bf760 (patch) | |
| tree | aa8baa63b9a238dcab233d8c1801f9c901370b69 /config.nmake | |
| parent | 06a3d1175c36926dac0a54c617d99d9db4e4a3fc (diff) | |
Use the right package name.
svn path=/trunk/; revision=52521
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 24fd15cbe0..65eda43b80 100644 --- a/config.nmake +++ b/config.nmake @@ -308,8 +308,8 @@ GTK_INST_VERSION=3.4 # #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX" !IF !DEFINED(QT_DIR) -!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)) -QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM) +!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 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 !ENDIF @@ -548,8 +548,8 @@ GTK_INST_VERSION=3.4 # #QT_DIR=output of "qmake -query QT_INSTALL_PREFIX" !IF !DEFINED(QT_DIR) -!IF EXIST(C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)) -QT_DIR=C:\Qt\Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM) +!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 !ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 !ENDIF |