diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-08 09:22:58 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-08-08 09:22:58 +0000 |
| commit | b9e54d2eb47b4429cf1b4a2cf50deb28db7c8dba (patch) | |
| tree | 4001c87f81c29aed692163eae07d56196d83d71f /packaging | |
| parent | 7b54edd5bf4f7d8861cbe59c9bf2ab8345c633d0 (diff) | |
Pass on WinPcap/MSVC redistributable executables to the WiresharkPortable launcher and not the extractor.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3547.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29335 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index c59d2c41cd..e25f3e2798 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -102,8 +102,6 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/ $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ - /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \ - /DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \ /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ Installer.nsi @@ -112,6 +110,8 @@ Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \ + /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \ + /DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \ WiresharkPortable.nsi clean: |