diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-08-30 15:55:12 +0000 |
| commit | 36ff508507eb52ae37e5015f52701bb1d26cafcf (patch) | |
| tree | c95f62cab84c5234e7a26faddb6deb193319f202 /packaging/nsis/Makefile.nmake | |
| parent | 84bf0acc0035cb284e8afcfb51ac7171eafc25ef (diff) | |
Try to fix PortableApps packaging. Note that the Qt definitions should
be in config.nmake along with everything else.
svn path=/trunk/; revision=51598
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index dc1c9cc339..64345dc755 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -219,9 +219,10 @@ NSIS_FLAGS=\ /DQT_DIR="..\..\wireshark-qt-release" \ !ENDIF !IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") - /DQT_VER=5 \ -!ELSE - /DQT_VER=4 \ + /DNEED_QT5_DLL=USE \ +!ENDIF +!IF EXIST("..\..\wireshark-qt-release\QtCore4.dll") + /DNEED_QT4_DLL=USE \ !ENDIF $(STAGING_DIR)\uninstall.exe : $(NSI) |