osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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.

svn path=/trunk/; revision=29335
This commit is contained in:
Kovarththanan Rajaratnam 2009-08-08 09:22:58 +00:00
parent 4f501b3655
commit d36637e8f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/portableapps/win32/makefile.nmake
View File

@ -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: