aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/portableapps
diff options
context:
space:
mode:
Diffstat (limited to 'packaging/portableapps')
-rw-r--r--packaging/portableapps/win32/Makefile.nmake16
-rwxr-xr-xpackaging/portableapps/win32/makenmake.pl20
2 files changed, 24 insertions, 12 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index f2b3681f93..aebe11f805 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -24,15 +24,18 @@ COPY = xcopy
MKDIR = mkdir
COPY_FLAGS = /d /y
!IFNDEF WIN32_SETUP_OPT
-WIN32_SETUP_OPT=--download
+WIN32_SETUP_OPT = --download
!ENDIF
+
+# XXX This should be defined in config.nmake.
!IF EXIST("..\..\wireshark-qt-release\qtshark.exe")
-QT_DIR="..\..\wireshark-qt-release"
+QT_DIR = "..\..\wireshark-qt-release"
!ENDIF
!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll")
- /DQT_VER=5 \
-!ELSE
- /DQT_VER=4 \
+NEED_QT5_DLL = USE
+!ENDIF
+!IF EXIST("..\..\wireshark-qt-release\QtCore4.dll")
+NEED_QT4_DLL = USE
!ENDIF
UPX_FLAGS = -q
@@ -114,7 +117,8 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/
/DVERSION=$(PAPPS_VERSION) \
/DWSVERSION=$(VERSION) \
/DQT_DIR=$(QT_DIR) \
- /DQT_VER=$(QT_VER) \
+ /DNEED_QT5_DLL=$(NEED_QT5_DLL) \
+ /DNEED_QT4_DLL=$(NEED_QT4_DLL) \
/DEXTRA_PLUGINS="$(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)" \
Installer.nsi
diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl
index 69766c70d6..9f624ce664 100755
--- a/packaging/portableapps/win32/makenmake.pl
+++ b/packaging/portableapps/win32/makenmake.pl
@@ -4,6 +4,10 @@
#
print q{
+#
+# DO NOT EDIT - autogenerated from makenmake.pl and ../../wireshark.manifest
+#
+
include ../../../config.nmake
include <win32.mak>
@@ -16,15 +20,19 @@ STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR)
COPY = xcopy
MOVE = mv
MKDIR = mkdir
-COPY_FLAGS = /d /y
+COPY_FLAGS = /d /y
+
+# XXX This should be defined in config.nmake.
!IF EXIST("$(TOPDIR)\wireshark-qt-release\qtshark.exe")
-QT_DIR="$(TOPDIR)\wireshark-qt-release"
+QT_DIR = "$(TOPDIR)\wireshark-qt-release"
+!ENDIF
+!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll")
+NEED_QT5_DLL = USE
!ENDIF
-!IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll")
- /DQT_VER=5 \
-!ELSE
- /DQT_VER=4 \
+!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll")
+NEED_QT4_DLL = USE
!ENDIF
+
distribution:
};