diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-08-30 11:18:06 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-08-30 11:18:06 +0000 |
commit | 84f2e7d2216bbb6ab697ce3292c8293146e5c35f (patch) | |
tree | 401d88467681de084fbb00c1e04c63ccdfdb01b8 /packaging/portableapps | |
parent | 14d0a15869f6dd2e827028356ed1918c640f6286 (diff) |
Try to fix Portable App buildbot
svn path=/trunk/; revision=51594
Diffstat (limited to 'packaging/portableapps')
-rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index 61056d65d8..f2b3681f93 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -29,6 +29,11 @@ WIN32_SETUP_OPT=--download !IF EXIST("..\..\wireshark-qt-release\qtshark.exe") QT_DIR="..\..\wireshark-qt-release" !ENDIF +!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") + /DQT_VER=5 \ +!ELSE + /DQT_VER=4 \ +!ENDIF UPX_FLAGS = -q @@ -109,6 +114,7 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ /DQT_DIR=$(QT_DIR) \ + /DQT_VER=$(QT_VER) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \ Installer.nsi |