diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-17 22:01:13 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-17 22:01:13 +0000 |
| commit | 7e431a45ce551b561ebe43110bb8afab98b39cde (patch) | |
| tree | dcbeeefe6d49b76a9d9e6e5cff35d0ddaf04b89e /packaging | |
| parent | adc373c4d70667cc56457c57440e1bc6b53bb91b (diff) | |
Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer
build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31301 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 744bcc04be..677647b9af 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -372,7 +372,7 @@ File "${GTK_DIR}\bin\${INTL_DLL}" File "${ZLIB_DIR}\zlib1.dll" !endif !ifdef C_ARES_DIR -File "${C_ARES_DIR}\cares.dll" +File "${C_ARES_DIR}\bin\libcares-2.dll" !endif !ifdef ADNS_DIR File "${ADNS_DIR}\..\${MSVC_VARIANT}\adns\adns_dll.dll" @@ -842,8 +842,9 @@ File "${GTK_DIR}\etc\gtk-2.0\*.*" !if ${WIRESHARK_TARGET_PLATFORM} == "win32" SetOutPath $INSTDIR\etc\pango File "${GTK_DIR}\etc\pango\pango.*" -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders -File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\loaders\libpixbufloader-*.dll" +; Not needed for GTK+ >= 2.18 +;SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\loaders +;File "${GTK_DIR}\lib\gtk-2.0\${GTK_LIB_DIR}\loaders\libpixbufloader-*.dll" !endif SetOutPath $INSTDIR\lib\gtk-2.0\${GTK_LIB_DIR}\engines |