From: Kevin M. Rosenberg Date: Fri, 4 Jun 2004 20:25:56 +0000 (+0000) Subject: r9551: windows updates X-Git-Tag: v3.8.6~335 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=c3da3f320846c5201b6eaf609dd47cf3e5876b0a;hp=e12e49ba39110f4a34def97d27bc8432f6de8665 r9551: windows updates --- diff --git a/ChangeLog b/ChangeLog index b788b27..54955e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 03 Jun 2004 Marcus Pearce + * Version 2.11.5 released * examples/clsql-tutorial.lisp: Remove obsolete :nulls-ok attribute, Select connection-spec based on connection type. Bugs reported by Bill Clementson. - + * uffi/uffi.dll, uffi/uffi.lib: Recompile with Visual Studio 2003 + * db-mysql/mysql-loader.lisp: Update check for zlibwapi library + name on Windows, add \bin\ directory to search path + 31 May 2004 Marcus Pearce * db-odbc/odbc-sql.lisp: DB-TYPE replaced with DATABASE-TYPE in DATABASE-CONNECT. diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc index e7991f1..096bb55 100644 --- a/db-mysql/Makefile.msvc +++ b/db-mysql/Makefile.msvc @@ -2,14 +2,14 @@ ########################################################################### # FILE IDENTIFICATION # -# Name: Makefile.msvc -# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) -# Programer: Kevin M. Rosenberg -# Date Started: Mar 2002 +# Name: Makefile.msvc +# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) +# Author: Kevin M. Rosenberg +# Created: Mar 2002 # # CVS Id: $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $ # -# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg # # CLSQL users are granted the rights to distribute and use this software # as governed by the terms of the Lisp Lesser GNU Public License @@ -17,7 +17,7 @@ ########################################################################### -BASE=clsql-mysql +BASE=mysql # Set to the directory where you have installed mysql's library MYSQL_DIR=c:/mysql diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index d93b783..93437e6 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -29,13 +29,14 @@ (defparameter *libz-library-path* (uffi:find-foreign-library - '("libz" "zlib") + '("libz" "zlibwapi" "zlib") `(,(make-pathname :directory (pathname-directory *load-truename*)) #+64bit "/usr/lib64/" "/usr/lib/" "/sw/lib/" "/usr/local/lib/" "/home/kevin/debian/src/clsql/db-mysql/" + "/bin/" "/mysql/lib/dll32/" "/mysql/lib/opt/") :drive-letters '("C"))) diff --git a/db-mysql/mysql.dll b/db-mysql/mysql.dll index 9725932..095c091 100644 Binary files a/db-mysql/mysql.dll and b/db-mysql/mysql.dll differ diff --git a/db-mysql/mysql.lib b/db-mysql/mysql.lib index 49f942b..0a2a75b 100644 Binary files a/db-mysql/mysql.lib and b/db-mysql/mysql.lib differ diff --git a/uffi/Makefile.msvc b/uffi/Makefile.msvc index 562c3dd..2edbfca 100644 --- a/uffi/Makefile.msvc +++ b/uffi/Makefile.msvc @@ -2,14 +2,14 @@ ########################################################################### # FILE IDENTIFICATION # -# Name: Makefile.msvc -# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) -# Programer: Kevin M. Rosenberg -# Date Started: Mar 2002 +# Name: Makefile.msvc +# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) +# Author: Kevin M. Rosenberg +# Created: Mar 2002 # # CVS Id: $Id: Makefile.msvc,v 1.1 2002/09/18 07:50:01 kevin Exp $ # -# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg # # CLSQL users are granted the rights to distribute and use this software # as governed by the terms of the Lisp Lesser GNU Public License @@ -17,7 +17,7 @@ ########################################################################### -BASE=clsql-uffi +BASE=uffi # Nothing to configure beyond here @@ -30,6 +30,6 @@ $(DLL): $(SRC) del $(OBJ) $(BASE).exp clean: - del /q $(DLL) + del /q $(DLL) $(BASE).LIB diff --git a/uffi/uffi.dll b/uffi/uffi.dll index b9d7cfa..1c41270 100644 Binary files a/uffi/uffi.dll and b/uffi/uffi.dll differ diff --git a/uffi/uffi.lib b/uffi/uffi.lib index 8dde929..a9ee8fe 100644 Binary files a/uffi/uffi.lib and b/uffi/uffi.lib differ