diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-04-05 22:38:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-04-05 22:38:12 +0000 |
| commit | 92c8f32ff737296e4ddd1b0141a5e0f6bf4e394c (patch) | |
| tree | 5f1736f1fe84fe354ac59c2fedf17f47e4b5b148 /Makefile.nmake | |
| parent | 303539c0052a2d5e5ff9093fdcca2a9eeef5831e (diff) | |
Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.
svn path=/trunk/; revision=36483
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index c6c6252a06..f0079f0a74 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -866,6 +866,7 @@ clean_setup: rm -r -f glib rm -r -f gnutls-2.8.1-1 rm -r -f gnutls-2.8.5-*-win??ws + rm -r -f gnutls-2.10.3-*-win??ws rm -r -f gtk2 rm -r -f gtk+ rm -r -f gtk-wimp @@ -1073,6 +1074,11 @@ install-all: install-generated-files xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d +! IF "$(INTL_DLL)" != "libintl-8.dll" +# The gtk+ bundle doesn't provide libintl-8.dll (which is the case +# with the 32-bit package); use the GNUTLS version. + xcopy $(GNUTLS_DIR)\bin\libintl-8.dll $(INSTALL_DIR) /d +! ENDIF !ENDIF !IFDEF LUA_DIR xcopy "$(LUA_DIR)\lua5.1.dll" $(INSTALL_DIR) /d |