diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-02-22 16:51:43 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-02-22 16:51:43 +0000 |
| commit | c4851a88ac46d009dc4ae08d29bf65c78f11f27e (patch) | |
| tree | e1754b9bfd8f05a4f0a3f67b97df4423f4747f93 /packaging/portableapps/win32 | |
| parent | 2fda9a32c228eac122da2cbafe3f452ab87bb862 (diff) | |
Add QtShark stuff to PortableApps
svn path=/trunk/; revision=47825
Diffstat (limited to 'packaging/portableapps/win32')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 4 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/makenmake.pl | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index ec4063cdba..5ee848380e 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -26,6 +26,9 @@ COPY_FLAGS = /d /y !IFNDEF WIN32_SETUP_OPT WIN32_SETUP_OPT=--download !ENDIF +!IF EXIST("..\..\wireshark-qt-release\qtshark.exe") +QT_DIR="..\..\wireshark-qt-release" +!ENDIF UPX_FLAGS = -q @@ -105,6 +108,7 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/ $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ + /DQT_DIR=$(QT_DIR) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \ Installer.nsi diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl index f96dda78c2..1c5c7b2fea 100755 --- a/packaging/portableapps/win32/makenmake.pl +++ b/packaging/portableapps/win32/makenmake.pl @@ -17,7 +17,9 @@ COPY = xcopy MOVE = mv MKDIR = mkdir COPY_FLAGS = /d /y - +!IF EXIST("$(TOPDIR)\wireshark-qt-release\qtshark.exe") +QT_DIR="$(TOPDIR)\wireshark-qt-release" \ +!ENDIF distribution: }; |