diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-28 22:11:51 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-28 22:11:51 +0000 |
| commit | 66558ef5a8ae7e36b0c9d687dfc635bcd692706a (patch) | |
| tree | d1c8220ae4c09cb032b3319b6168aeac3819d55f /packaging/portableapps | |
| parent | 6ef5eb635cbe9dfb4954588dcacedfc3779667de (diff) | |
Remove some (but not all) U3 remnants.
svn path=/trunk/; revision=52935
Diffstat (limited to 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 1 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index aebe11f805..f889ce8d65 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -19,7 +19,6 @@ NSIS_PLUGINS = nsis-plugins FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. -U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index 50538ac646..9732f06518 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -151,7 +151,9 @@ Section "Main" Abort FoundProgramEXE: - ;=== Check if Wireshark running from somwehere else (e.g. U3 device) + ;=== Check if Wireshark running from somwehere else + ; XXX We might be able to use the Wireshark-is-running mutex here. + ; See IsWiresharkRunning in packaging\nsis\common.nsh for details. ; if the following step fails, you'll need the FindProcDLL plug-in from: ; http://nsis.sourceforge.net/Find_Process_By_Name ;FindProcDLL::FindProc "${PROGRAMEXECUTABLE}" |