diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-10 23:45:16 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-10 23:45:16 +0000 |
| commit | 06a3d1175c36926dac0a54c617d99d9db4e4a3fc (patch) | |
| tree | 229e72e069efc87a529433cb5241404267677468 /config.nmake | |
| parent | 878186be3d99d2dbff559272ade339f2265d4d0e (diff) | |
Try to discover Qt similar to the way we discover Python.
svn path=/trunk/; revision=52520
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index e913dfb085..24fd15cbe0 100644 --- a/config.nmake +++ b/config.nmake @@ -302,7 +302,18 @@ GTK_INST_VERSION=3.4 # This must point to a top-level Qt directory. QMake should be in # $(QT_DIR)\bin # -#QT_DIR=C:\Qt\5.1.1-MSVC2010-win32 +# Qt's various paths are hardcoded but with care you can relocate your +# installation directory: +# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library +# +#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) +!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) +QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 +!ENDIF +!ENDIF # # Recommended: WinPcap developer's pack to capture network traffic. @@ -531,7 +542,18 @@ GTK_INST_VERSION=3.4 # This must point to a top-level Qt directory. QMake should be in # $(QT_DIR)\bin # -#QT_DIR=C:\Qt\5.1.1-MSVC2010-win64 +# Qt's various paths are hardcoded but with care you can relocate your +# installation directory: +# http://stackoverflow.com/questions/913642/qmake-and-qt-install-prefix-how-can-i-select-a-new-location-for-qt-library +# +#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) +!ELSE IF EXIST(C:\Qt\Qt5.1.1\5.1.1\msvc2010) +QT_DIR=C:\Qt\Qt5.1.1\5.1.1\msvc2010 +!ENDIF +!ENDIF # # Recommended: WinPcap developer's pack to capture network traffic. |