diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-21 21:06:01 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-12-21 21:06:01 +0000 |
| commit | fc9cceceada79c5499a41db9b1d99d7ed66fe582 (patch) | |
| tree | c7dd20c72484499198d106b5ba392787651f500a /Makefile.nmake | |
| parent | a831efc2418106a9eec3633aff7fe561c5042402 (diff) | |
Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31341 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 920b87b877..f92149ac1b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -777,9 +777,9 @@ process_libs: lua5.1.4 lua$(LUA_DIST)_lib.zip !ENDIF -!IFDEF GNUTLS_DIR +!IFDEF GNUTLS_PKG @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . gnutls-2.8.5-1.zip + . gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF !IFDEF PORTAUDIO_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -826,7 +826,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/gettext-0.17-1 # win64 rm -r -f $(WIRESHARK_LIBS)/glib rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.1-1 - rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.5-1 + rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.5-*-win??ws rm -r -f $(WIRESHARK_LIBS)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ rm -r -f $(WIRESHARK_LIBS)/gtk-wimp |