diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-17 22:01:13 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-17 22:01:13 +0000 |
| commit | 7524c0b96314b87ca6a2c8f4dbf14770277ef31a (patch) | |
| tree | dcbeeefe6d49b76a9d9e6e5cff35d0ddaf04b89e /packaging | |
| parent | 9b55f28a3d2078843e396888e9bb9fe32954877b (diff) | |
| download | wireshark-7524c0b96314b87ca6a2c8f4dbf14770277ef31a.tar.gz | |
Use the latest c-ares and GeoIP libraries. Try to fix the Win32 installer
build.
svn path=/trunk/; revision=31301
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 |