diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-13 17:11:15 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-15 20:26:13 +0000 |
| commit | 40ce324f4d0beda62a957f5f6c47dcc9ac5c5c18 (patch) | |
| tree | c20e9a349a21b8e77e7d95420b0954550e17a51c /ui | |
| parent | 05c0152370cbe084193ad2946e6fc96a1017c08e (diff) | |
| download | wireshark-40ce324f4d0beda62a957f5f6c47dcc9ac5c5c18.tar.gz | |
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 <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/Wireshark.pro | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index 5972a9a11e..5ac94cdf1c 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -493,19 +493,6 @@ win32 { QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\\n\\t)) QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\$${INSTALL_DIR}\\plugins\\*.dll $(DESTDIR)plugins$$escape_expand(\\n\\t)) - EXTCAP_DIR = $(DESTDIR)extcap - QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${EXTCAP_DIR} $(MKDIR) $${EXTCAP_DIR}$$escape_expand(\\n\\t)) - EXTRA_EXTCAP_BINFILES = \ - ../../androiddump.exe ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \ - $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \ - $${GLIB_DIR}/bin/$${INTL_DLL} $${ZLIB_DIR}/zlib1.dll \ - $${GNUTLS_DIR}/bin/$${GCC_DLL} $${GNUTLS_DIR}/bin/libgcrypt-20.dll \ - $${GNUTLS_DIR}/bin/$${GPGERROR_DLL} - EXTRA_EXTCAP_BINFILES ~= s,/,\\,g - for(FILE,EXTRA_EXTCAP_BINFILES){ - QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)extcap$$escape_expand(\\n\\t)) - } - # This doesn't depend on wireshark-gtk2. It also doesn't work. #PLUGINS_IN_PWD=$${IN_PWD} #PLUGINS_OUT_PWD=$${OUT_PWD} |