From 40ce324f4d0beda62a957f5f6c47dcc9ac5c5c18 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 13 Apr 2015 17:11:15 -0700 Subject: Set the extcap working directory on Windows. On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- packaging/portableapps/Makefile.nmake | 1 - 1 file changed, 1 deletion(-) (limited to 'packaging/portableapps') diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake index 6a25f928d0..5ffaeb954e 100644 --- a/packaging/portableapps/Makefile.nmake +++ b/packaging/portableapps/Makefile.nmake @@ -62,7 +62,6 @@ dirs: #!IFDEF UPX # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll -# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\extcap\*.dll # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll -- cgit v1.2.3