Update version to 07.03.0209

Make the Unicode version the primary and remove others.

diff --git a/Makefile.am b/Makefile.am
index 0728ab07f334603e71eecaae7b306119b6d23e39..fb3458be402702fe7fe28125410e44711c2e5d52 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Makefile.am for psqlodbc (PostgreSQL ODBC driver)
 #
-# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.10 2004/02/04 08:55:28 dpage Exp $
+# $Header: /home/heikki/psqlodbc-cvs-copy/psqlodbc/Makefile.am,v 1.11 2004/04/14 09:11:56 dpage Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -48,10 +48,9 @@ dist_pkgdata_DATA = odbc.sql odbc-drop.sql
 BUILT_SOURCES = odbc-drop.sql
 
 EXTRA_DIST = README.unix license.txt notice.txt readme.txt odbcinst.ini \
-   libtool.m4 psqlodbc_win32.def psqlodbc_apiw.def psqlodbc_api30w.def \
-   psqlodbc_api25.def win32.mak win32_30w.mak win32_25.mak \
+   libtool.m4 psqlodbc_win32.def win32.mak \
    dlg_wingui.c win_setup.h win_md5.c setup.c \
-   psqlodbc.reg psqlodbc25.reg psqlodbc30w.reg
+   psqlodbc.reg
 MAINTAINERCLEANFILES = odbc-drop.sql \
    Makefile.in config.guess config.h.in config.sub configure \
    install-sh missing mkinstalldirs aclocal.m4 ltmain.sh \

diff --git a/configure.ac b/configure.ac
index e273020ba719ab917a3d0a5e31904c8eec8e1485..6fa7a4399dc0ab8be4fbc17a2496ff9e168419ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(psqlodbc, 07.03.0205, [[email protected]])
+AC_INIT(psqlodbc, 07.03.0209, [[email protected]])
 AC_PREREQ(2.52)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([bind.c])

diff --git a/psqlodbc25.reg b/psqlodbc25.reg
deleted file mode 100644 (file)
index 86a8afd..0000000
--- a/psqlodbc25.reg
+++ /dev/null
@@ -1,16 +0,0 @@
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL Legacy"="Installed"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Legacy]
-"APILevel"="1"
-"ConnectFunctions"="YYN"
-"Driver"="PSQLODBC25.DLL"
-"DriverODBCVer"="02.50"
-"FileUsage"="0"
-"Setup"="PSQLODBC.DLL"
-"SQLLevel"="1"
-"UsageCount"=dword:00000001

diff --git a/psqlodbc30w.reg b/psqlodbc30w.reg
deleted file mode 100644 (file)
index 677b3bb..0000000
--- a/psqlodbc30w.reg
+++ /dev/null
@@ -1,18 +0,0 @@
-REGEDIT4
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI]
-
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"PostgreSQL Unicode (Beta)"="Installed"
-
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\PostgreSQL Unicode (Beta)]
-"APILevel"="1"
-"ConnectFunctions"="YYN"
-"Driver"="PSQLODBC30W.DLL"
-"DriverODBCVer"="03.00"
-"FileUsage"="0"
-"Setup"="PSQLODBC.DLL"
-"SQLLevel"="1"
-"UsageCount"=dword:00000001
-

diff --git a/psqlodbc_api25.def b/psqlodbc_api25.def
deleted file mode 100644 (file)
index 9e20edc..0000000
--- a/psqlodbc_api25.def
+++ /dev/null
@@ -1,60 +0,0 @@
-LIBRARY psqlodbc25
-EXPORTS
-SQLAllocConnect @1
-SQLAllocEnv @2
-SQLAllocStmt @3
-SQLBindCol @4
-SQLCancel @5
-SQLColAttributes @6
-SQLConnect @7
-SQLDescribeCol @8
-SQLDisconnect @9
-SQLError @10
-SQLExecDirect @11
-SQLExecute @12
-SQLFetch @13
-SQLFreeConnect @14
-SQLFreeEnv @15
-SQLFreeStmt @16
-SQLGetCursorName @17
-SQLNumResultCols @18
-SQLPrepare @19
-SQLRowCount @20
-SQLSetCursorName @21
-SQLTransact @23
-SQLColumns @40
-SQLDriverConnect @41
-SQLGetConnectOption @42
-SQLGetData @43
-SQLGetFunctions @44
-SQLGetInfo @45
-SQLGetStmtOption @46
-SQLGetTypeInfo @47
-SQLParamData @48
-SQLPutData @49
-SQLSetConnectOption @50
-SQLSetStmtOption @51
-SQLSpecialColumns @52
-SQLStatistics @53
-SQLTables @54
-SQLBrowseConnect @55
-SQLColumnPrivileges @56
-SQLDescribeParam @58
-SQLExtendedFetch @59
-SQLForeignKeys @60
-SQLMoreResults @61
-SQLNativeSql @62
-SQLNumParams @63
-SQLParamOptions @64
-SQLPrimaryKeys @65
-SQLProcedureColumns @66
-SQLProcedures @67
-SQLSetPos @68
-SQLSetScrollOptions @69
-SQLTablePrivileges @70
-SQLBindParameter @72
-SQLDummyOrdinal @199
-dconn_FDriverConnectProc @200
-DllMain @201
-ConfigDSN @202
-

diff --git a/psqlodbc_api30w.def b/psqlodbc_api30w.def
deleted file mode 100644 (file)
index 0901540..0000000
--- a/psqlodbc_api30w.def
+++ /dev/null
@@ -1,108 +0,0 @@
-LIBRARY psqlodbc30w
-EXPORTS
-;SQLAllocConnect @1
-;SQLAllocEnv @2
-;SQLAllocStmt @3
-SQLBindCol @4
-SQLCancel @5
-; SQLColAttributes @6
-SQLConnect @7
-SQLDescribeCol @8
-SQLDisconnect @9
-;SQLError @10
-SQLExecDirect @11
-SQLExecute @12
-SQLFetch @13
-;SQLFreeConnect @14
-;SQLFreeEnv @15
-SQLFreeStmt @16
-SQLGetCursorName @17
-SQLNumResultCols @18
-SQLPrepare @19
-SQLRowCount @20
-SQLSetCursorName @21
-;SQLTransact @23
-SQLColumns @40
-SQLDriverConnect @41
-SQLGetData @43
-SQLGetFunctions @44
-SQLGetInfo @45
-;SQLGetStmtOption @46
-SQLGetTypeInfo @47
-SQLParamData @48
-SQLPutData @49
-SQLSpecialColumns @52
-SQLStatistics @53
-SQLTables @54
-SQLBrowseConnect @55
-SQLColumnPrivileges @56
-SQLDescribeParam @58
-SQLExtendedFetch @59
-SQLForeignKeys @60
-SQLMoreResults @61
-SQLNativeSql @62
-SQLNumParams @63
-SQLParamOptions @64
-SQLPrimaryKeys @65
-SQLProcedureColumns @66
-SQLProcedures @67
-SQLSetPos @68
-SQLSetScrollOptions @69
-SQLTablePrivileges @70
-SQLBindParameter @72
-
-SQLAllocHandle @80
-SQLBindParam @81
-SQLCloseCursor @82
-SQLColAttribute @83
-SQLCopyDesc @84
-SQLEndTran @85
-SQLFetchScroll @86
-SQLFreeHandle @87
-SQLGetDescField @88
-SQLGetDescRec @89
-SQLGetDiagField @90
-SQLGetDiagRec @91
-SQLGetEnvAttr @92
-SQLGetConnectAttr @93
-SQLGetStmtAttr @94
-SQLSetConnectAttr @95
-SQLSetDescField @96
-SQLSetDescRec @97
-SQLSetEnvAttr @98
-SQLSetStmtAttr @99
-SQLBulkOperations @100
-
-SQLDummyOrdinal @199
-dconn_FDriverConnectProc @200
-DllMain @201
-ConfigDSN @202
-
-SQLColAttributeW   @101
-SQLColumnPrivilegesW   @102
-SQLColumnsW        @103
-SQLConnectW        @104
-SQLDescribeColW        @106
-SQLExecDirectW     @107
-SQLForeignKeysW        @108
-SQLGetConnectAttrW @109
-SQLGetCursorNameW  @110
-SQLGetInfoW        @111
-SQLNativeSqlW      @112
-SQLPrepareW        @113
-SQLPrimaryKeysW        @114
-SQLProcedureColumnsW   @115
-SQLProceduresW     @116
-SQLSetConnectAttrW @117
-SQLSetCursorNameW  @118
-SQLSpecialColumnsW @119
-SQLStatisticsW     @120
-SQLTablesW     @121
-SQLTablePrivilegesW    @122
-SQLDriverConnectW  @123
-SQLGetDiagRecW     @124
-SQLGetStmtAttrW        @125
-SQLSetStmtAttrW        @126
-SQLSetDescFieldW   @127
-SQLGetTypeInfoW        @128
-SQLGetDiagFieldW   @129

diff --git a/psqlodbc_apiw.def b/psqlodbc_apiw.def
deleted file mode 100644 (file)
index c719a20..0000000
--- a/psqlodbc_apiw.def
+++ /dev/null
@@ -1,84 +0,0 @@
-LIBRARY psqlodbc
-EXPORTS
-SQLAllocConnect @1
-SQLAllocEnv @2
-SQLAllocStmt @3
-SQLBindCol @4
-SQLCancel @5
-SQLColAttributes @6
-SQLConnect @7
-SQLDescribeCol @8
-SQLDisconnect @9
-SQLError @10
-SQLExecDirect @11
-SQLExecute @12
-SQLFetch @13
-SQLFreeConnect @14
-SQLFreeEnv @15
-SQLFreeStmt @16
-SQLGetCursorName @17
-SQLNumResultCols @18
-SQLPrepare @19
-SQLRowCount @20
-SQLSetCursorName @21
-SQLTransact @23
-SQLColumns @40
-SQLDriverConnect @41
-SQLGetConnectOption @42
-SQLGetData @43
-SQLGetFunctions @44
-SQLGetInfo @45
-SQLGetStmtOption @46
-SQLGetTypeInfo @47
-SQLParamData @48
-SQLPutData @49
-SQLSetConnectOption @50
-SQLSetStmtOption @51
-SQLSpecialColumns @52
-SQLStatistics @53
-SQLTables @54
-SQLBrowseConnect @55
-SQLColumnPrivileges @56
-SQLDescribeParam @58
-SQLExtendedFetch @59
-SQLForeignKeys @60
-SQLMoreResults @61
-SQLNativeSql @62
-SQLNumParams @63
-SQLParamOptions @64
-SQLPrimaryKeys @65
-SQLProcedureColumns @66
-SQLProcedures @67
-SQLSetPos @68
-SQLSetScrollOptions @69
-SQLTablePrivileges @70
-SQLBindParameter @72
-
-SQLColAttributesW  @101
-SQLColumnPrivilegesW   @102
-SQLColumnsW        @103
-SQLConnectW        @104
-SQLDescribeColW        @106
-SQLExecDirectW     @107
-SQLForeignKeysW        @108
-SQLGetConnectOptionW   @109
-SQLGetCursorNameW  @110
-SQLGetInfoW        @111
-SQLNativeSqlW      @112
-SQLPrepareW        @113
-SQLPrimaryKeysW        @114
-SQLProcedureColumnsW   @115
-SQLProceduresW     @116
-SQLSetConnectOptionW   @117
-SQLSetCursorNameW  @118
-SQLSpecialColumnsW @119
-SQLStatisticsW     @120
-SQLTablesW     @121
-SQLTablePrivilegesW    @122
-SQLDriverConnectW  @123
-SQLErrorW      @124
-SQLGetTypeInfoW        @128
-
-dconn_FDriverConnectProc @200
-DllMain @201
-ConfigDSN @202

diff --git a/psqlodbc_win32.def b/psqlodbc_win32.def
index 850dce68c5a3a07fe536ddb7db8d1565b147a4b1..489e86d15f11a40f241cf8f87cfb5b536037fb95 100644 (file)
--- a/psqlodbc_win32.def
+++ b/psqlodbc_win32.def
@@ -5,7 +5,7 @@ EXPORTS
 ;SQLAllocStmt @3
 SQLBindCol @4
 SQLCancel @5
-; SQLColAttributes @6 */
+; SQLColAttributes @6
 SQLConnect @7
 SQLDescribeCol @8
 SQLDisconnect @9
@@ -24,7 +24,6 @@ SQLSetCursorName @21
 ;SQLTransact @23
 SQLColumns @40
 SQLDriverConnect @41
-;SQLGetConnectOption @42
 SQLGetData @43
 SQLGetFunctions @44
 SQLGetInfo @45
@@ -32,8 +31,6 @@ SQLGetInfo @45
 SQLGetTypeInfo @47
 SQLParamData @48
 SQLPutData @49
-;SQLSetConnectOption @50
-;SQLSetStmtOption @51
 SQLSpecialColumns @52
 SQLStatistics @53
 SQLTables @54
@@ -80,3 +77,32 @@ SQLDummyOrdinal @199
 dconn_FDriverConnectProc @200
 DllMain @201
 ConfigDSN @202
+
+SQLColAttributeW   @101
+SQLColumnPrivilegesW   @102
+SQLColumnsW        @103
+SQLConnectW        @104
+SQLDescribeColW        @106
+SQLExecDirectW     @107
+SQLForeignKeysW        @108
+SQLGetConnectAttrW @109
+SQLGetCursorNameW  @110
+SQLGetInfoW        @111
+SQLNativeSqlW      @112
+SQLPrepareW        @113
+SQLPrimaryKeysW        @114
+SQLProcedureColumnsW   @115
+SQLProceduresW     @116
+SQLSetConnectAttrW @117
+SQLSetCursorNameW  @118
+SQLSpecialColumnsW @119
+SQLStatisticsW     @120
+SQLTablesW     @121
+SQLTablePrivilegesW    @122
+SQLDriverConnectW  @123
+SQLGetDiagRecW     @124
+SQLGetStmtAttrW        @125
+SQLSetStmtAttrW        @126
+SQLSetDescFieldW   @127
+SQLGetTypeInfoW        @128
+SQLGetDiagFieldW   @129

diff --git a/version.h b/version.h
index b0586a2778fc37e5ba01af7c6d951a87445685d3..71f716f33b7d584c5acc11a6d7e4c7b1a463136a 100644 (file)
--- a/version.h
+++ b/version.h
@@ -9,8 +9,8 @@
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
-#define POSTGRESDRIVERVERSION      "07.03.0208"
-#define POSTGRES_RESOURCE_VERSION  "07.03.0208\0"
-#define PG_DRVFILE_VERSION     7,3,2,08
+#define POSTGRESDRIVERVERSION      "07.03.0209"
+#define POSTGRES_RESOURCE_VERSION  "07.03.0209\0"
+#define PG_DRVFILE_VERSION     7,3,2,09
 
 #endif

diff --git a/win32.mak b/win32.mak
index dcfb5f400ca217ac30515ceb3f2ea7628ffb588f..8a397462ef6920b1969fd12aa5a760f9189327d9 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -1,36 +1,34 @@
 #
-# File:            win32.mak(default ODBC3.0)
+# File:            win32.mak
 #
-# Description:     psqlodbc Makefile for Win32.
+# Description:     psqlodbc Unicode version Makefile for Win32.
 #
-# Configurations:  ODBC30Debug, ODBC30, MultibyteDebug30, MultibyteODBC30
+# Configurations:  Debug, Release
 # Build Types:     ALL, CLEAN
-# Usage:       NMAKE /f win32_30.mak CFG=[ODBC30 | ODBC30Debug | MultibyteODBC30 | MultibyteDebug30] [ALL | CLEAN]
+# Usage:       NMAKE /f win32.mak CFG=[Release | Debug] [ALL | CLEAN]
 #
 # Comments:        Created by Dave Page, 2001-02-12
 #
 
-!MESSAGE Building the PostgreSQL ODBC 3.0 Driver for Win32...
+!MESSAGE Building the PostgreSQL Unicode 3.0 Driver for Win32...
 !MESSAGE
 !IF "$(CFG)" == ""
-CFG=MultibyteODBC30
-!MESSAGE No configuration specified. Defaulting to ODBC30.
+CFG=Release
+!MESSAGE No configuration specified. Defaulting to Release.
 !MESSAGE
 !ENDIF 
 
-!IF "$(CFG)" != "ODBC30" && "$(CFG)" != "ODBC30Debug" && "$(CFG)" != "MultibyteODBC30" && "$(CFG)" != "MultibyteDebug30"
+!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug"
 !MESSAGE Invalid configuration "$(CFG)" specified.
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f win32_30.mak CFG=[ODBC30 | ODBC30Debug | MultibyteODBC30 | MultiByteDebug] [ALL | CLEAN]
+!MESSAGE NMAKE /f win32.mak CFG=[Release | Debug] [ALL | CLEAN]
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "ODBC30" (Win32 Release DLL)
-!MESSAGE "ODBC30Debug" (Win32 Debug DLL)
-!MESSAGE "MultibyteODBC30" (Win32 Release DLL with Multibyte support)
-!MESSAGE "MultibyteDebug30" (Win32 Debug DLL with Multibyte support)
+!MESSAGE "Release" (Win32 Release DLL)
+!MESSAGE "Debug" (Win32 Debug DLL)
 !MESSAGE 
 !ERROR An invalid configuration was specified.
 !ENDIF 
@@ -41,17 +39,11 @@ NULL=
 NULL=nul
 !ENDIF 
 
-!IF  "$(CFG)" == "ODBC30" || "$(CFG)" == "MultibyteODBC30"
+!IF  "$(CFG)" == "Release"
 
-!IF "$(CFG)" == "MultibyteODBC30"
-OUTDIR=.\MultibyteODBC30
-OUTDIRBIN=.\MultibyteODBC30
-INTDIR=.\MultibyteODBC30
-!ELSE
-OUTDIR=.\ODBC30
-OUTDIRBIN=.\ODBC30
-INTDIR=.\ODBC30
-!ENDIF
+OUTDIR=.\Release
+OUTDIRBIN=.\Release
+INTDIR=.\Release
 
 ALL : "$(OUTDIRBIN)\psqlodbc.dll"
 
@@ -71,9 +63,11 @@ CLEAN :
    -@erase "$(INTDIR)\lobj.obj"
    -@erase "$(INTDIR)\win_md5.obj"
    -@erase "$(INTDIR)\misc.obj"
-!IF "$(CFG)" == "MultibyteODBC30"
+   -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\multibyte.obj"
-!ENDIF
+   -@erase "$(INTDIR)\odbcapiw.obj"
+   -@erase "$(INTDIR)\odbcapi30w.obj"
+   -@erase "$(INTDIR)\win_unicode.obj"
    -@erase "$(INTDIR)\options.obj"
    -@erase "$(INTDIR)\parse.obj"
    -@erase "$(INTDIR)\pgtypes.obj"
@@ -88,7 +82,6 @@ CLEAN :
    -@erase "$(INTDIR)\tuplelist.obj"
    -@erase "$(INTDIR)\odbcapi.obj"
    -@erase "$(INTDIR)\odbcapi30.obj"
-   -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\descriptor.obj"
    -@erase "$(INTDIR)\vc60.idb"
    -@erase "$(OUTDIR)\psqlodbc.dll"
@@ -100,11 +93,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-!IF "$(CFG)" == "MultibyteODBC30"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-!ELSE
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-!ENDIF
+CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -162,9 +151,11 @@ LINK32_OBJS= \
    "$(INTDIR)\lobj.obj" \
    "$(INTDIR)\win_md5.obj" \
    "$(INTDIR)\misc.obj" \
-!IF "$(CFG)" == "MultibyteODBC30"
+   "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\multibyte.obj" \
-!ENDIF
+   "$(INTDIR)\odbcapiw.obj" \
+   "$(INTDIR)\odbcapi30w.obj" \
+   "$(INTDIR)\win_unicode.obj" \
    "$(INTDIR)\options.obj" \
    "$(INTDIR)\parse.obj" \
    "$(INTDIR)\pgtypes.obj" \
@@ -178,7 +169,6 @@ LINK32_OBJS= \
    "$(INTDIR)\tuplelist.obj" \
    "$(INTDIR)\odbcapi.obj" \
    "$(INTDIR)\odbcapi30.obj" \
-   "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\descriptor.obj" \
    "$(INTDIR)\psqlodbc.res"
 
@@ -187,15 +177,7 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
 
-!ELSEIF  "$(CFG)" == "ODBC30Debug" || "$(CFG)" == "MultibyteDebug30"
-
-!IF "$(CFG)" == "MultibyteDebug30"
-OUTDIR=.\MultibyteDebug30
-INTDIR=.\MultibyteDebug30
-!ELSE
-OUTDIR=.\ODBC30Debug
-INTDIR=.\ODBC30Debug
-!ENDIF
+!ELSEIF  "$(CFG)" == "Debug"
 
 ALL : "$(OUTDIR)\psqlodbc.dll"
 
@@ -215,9 +197,11 @@ CLEAN :
    -@erase "$(INTDIR)\lobj.obj"
    -@erase "$(INTDIR)\win_md5.obj"
    -@erase "$(INTDIR)\misc.obj"
-!IF "$(CFG)" == "MultibyteDebug30" 
+   -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\multibyte.obj"
-!ENDIF
+   -@erase "$(INTDIR)\odbcapiw.obj"
+   -@erase "$(INTDIR)\odbcapi30w.obj"
+   -@erase "$(INTDIR)\win_unicode.obj"
    -@erase "$(INTDIR)\options.obj"
    -@erase "$(INTDIR)\parse.obj"
    -@erase "$(INTDIR)\pgtypes.obj"
@@ -232,7 +216,6 @@ CLEAN :
    -@erase "$(INTDIR)\tuplelist.obj"
    -@erase "$(INTDIR)\odbcapi.obj"
    -@erase "$(INTDIR)\odbcapi30.obj"
-   -@erase "$(INTDIR)\pgapi30.obj"
    -@erase "$(INTDIR)\descriptor.obj"
    -@erase "$(INTDIR)\vc60.idb"
    -@erase "$(INTDIR)\vc60.pdb"
@@ -247,11 +230,7 @@ CLEAN :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
 CPP=cl.exe
-!IF "$(CFG)" == "MultibyteDebug30" 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-!ELSE
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-!ENDIF
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -307,11 +286,13 @@ LINK32_OBJS= \
    "$(INTDIR)\info.obj" \
    "$(INTDIR)\info30.obj" \
    "$(INTDIR)\lobj.obj" \
-   "$(INTDIR)\win_md5.obj" \
+   "$(INTDIR)\win_md5.obj"
    "$(INTDIR)\misc.obj" \
-!IF "$(CFG)" == "MultibyteDebug30" 
+   "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\multibyte.obj" \
-!ENDIF
+   "$(INTDIR)\odbcapiw.obj" \
+   "$(INTDIR)\odbcapi30w.obj" \
+   "$(INTDIR)\win_unicode.obj" \
    "$(INTDIR)\options.obj" \
    "$(INTDIR)\parse.obj" \
    "$(INTDIR)\pgtypes.obj" \
@@ -325,7 +306,6 @@ LINK32_OBJS= \
    "$(INTDIR)\tuplelist.obj" \
    "$(INTDIR)\odbcapi.obj" \
    "$(INTDIR)\odbcapi30.obj" \
-   "$(INTDIR)\pgapi30.obj" \
    "$(INTDIR)\descriptor.obj" \
    "$(INTDIR)\psqlodbc.res"
 
@@ -336,7 +316,7 @@ LINK32_OBJS= \
 
 !ENDIF 
 
-!IF "$(CFG)" == "ODBC30" || "$(CFG)" == "ODBC30Debug" || "$(CFG)" == "MultibyteODBC30" || "$(CFG)" == "MultibyteDebug30"
+!IF "$(CFG)" == "Release" || "$(CFG)" == "Debug"
 
 SOURCE=bind.c
 
@@ -416,14 +396,30 @@ SOURCE=misc.c
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
-!IF "$(CFG)" == "MultibyteODBC30" || "$(CFG)" == "MultibyteDebug30" 
-
 SOURCE=multibyte.c
 
 "$(INTDIR)\multibyte.obj" : $(SOURCE) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
-!ENDIF
+SOURCE=odbcapiw.c
+
+"$(INTDIR)\odbcapiw.obj" : $(SOURCE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=pgapi30.c
+
+"$(INTDIR)\pgapi30.obj" : $(SOURCE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=odbcapi30w.c
+
+"$(INTDIR)\odbcapi30w.obj" : $(SOURCE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+SOURCE=win_unicode.c
+
+"$(INTDIR)\win_unicode.obj" : $(SOURCE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=options.c
@@ -452,26 +448,16 @@ SOURCE=psqlodbc.c
 
 SOURCE=psqlodbc.rc
 
-!IF "$(CFG)" == "ODBC30"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" $(SOURCE)
-!ENDIF
-
-!IF "$(CFG)" == "MultibyteODBC30"
+!IF "$(CFG)" == "Release"
 "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
    $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" /d "MULTIBYTE" $(SOURCE)
 !ENDIF
 
-!IF "$(CFG)" == "ODBC30Debug"
+!IF "$(CFG)" == "Debug"
 "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
    $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" $(SOURCE)
 !ENDIF
 
-!IF "$(CFG)" == "MultibyteDebug30"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" /d "MULTIBYTE" $(SOURCE)
-!ENDIF
-
 
 SOURCE=qresult.c
 
@@ -532,11 +518,6 @@ SOURCE=odbcapi30.c
 "$(INTDIR)\odbcapi30.obj" : $(SOURCE) "$(INTDIR)"
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
-SOURCE=pgapi30.c
-
-"$(INTDIR)\pgapi30.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
 SOURCE=descriptor.c
 
 "$(INTDIR)\descriptor.obj" : $(SOURCE) "$(INTDIR)"

diff --git a/win32_25.mak b/win32_25.mak
deleted file mode 100644 (file)
index 2cebc4a..0000000
--- a/win32_25.mak
+++ /dev/null
@@ -1,519 +0,0 @@
-#
-# File:            win32_25.mak
-#
-# Description:     psqlodbc25 Makefile for Win32.
-#
-# Configurations:  Debug, Release, MultibyteDebug, MultibyteRelease
-# Build Types:     ALL, CLEAN
-# Usage:       NMAKE /f win32.mak CFG=[Release | Debug | MultibyteRelease | MultiByteDebug] [ALL | CLEAN]
-#
-# Comments:        Created by Dave Page, 2001-02-12
-#
-
-!MESSAGE Building the PostgreSQL ODBC Driver for Win32...
-!MESSAGE
-!IF "$(CFG)" == ""
-CFG=MultibyteRelease
-!MESSAGE No configuration specified. Defaulting to Release.
-!MESSAGE
-!ENDIF 
-
-!IF "$(CFG)" != "Release" && "$(CFG)" != "Debug" && "$(CFG)" != "MultibyteRelease" && "$(CFG)" != "MultibyteDebug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f win32.mak CFG=[Release | Debug | MultibyteRelease | MultiByteDebug] [ALL | CLEAN]
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Release" (Win32 Release DLL)
-!MESSAGE "Debug" (Win32 Debug DLL)
-!MESSAGE "MultibyteRelease" (Win32 Release DLL with Multibyte support)
-!MESSAGE "MultibyteDebug" (Win32 Debug DLL with Multibyte support)
-!MESSAGE 
-!ERROR An invalid configuration was specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "Release" || "$(CFG)" == "MultibyteRelease"
-
-!IF "$(CFG)" == "MultibyteRelease"
-OUTDIR=.\MultibyteRelease
-OUTDIRBIN=.\MultibyteRelease
-INTDIR=.\MultibyteRelease
-!ELSE
-OUTDIR=.\Release
-OUTDIRBIN=.\Release
-INTDIR=.\Release
-!ENDIF
-
-ALL : "$(OUTDIRBIN)\psqlodbc25.dll"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\bind.obj"
-   -@erase "$(INTDIR)\columninfo.obj"
-   -@erase "$(INTDIR)\connection.obj"
-   -@erase "$(INTDIR)\convert.obj"
-   -@erase "$(INTDIR)\dlg_specific.obj"
-   -@erase "$(INTDIR)\dlg_wingui.obj"
-   -@erase "$(INTDIR)\drvconn.obj"
-   -@erase "$(INTDIR)\environ.obj"
-   -@erase "$(INTDIR)\execute.obj"
-   -@erase "$(INTDIR)\info.obj"
-   -@erase "$(INTDIR)\lobj.obj"
-   -@erase "$(INTDIR)\win_md5.obj"
-   -@erase "$(INTDIR)\misc.obj"
-!IF "$(CFG)" == "MultibyteRelease"
-   -@erase "$(INTDIR)\multibyte.obj"
-!ENDIF
-   -@erase "$(INTDIR)\options.obj"
-   -@erase "$(INTDIR)\parse.obj"
-   -@erase "$(INTDIR)\pgtypes.obj"
-   -@erase "$(INTDIR)\psqlodbc.obj"
-   -@erase "$(INTDIR)\psqlodbc.res"
-   -@erase "$(INTDIR)\qresult.obj"
-   -@erase "$(INTDIR)\results.obj"
-   -@erase "$(INTDIR)\setup.obj"
-   -@erase "$(INTDIR)\socket.obj"
-   -@erase "$(INTDIR)\statement.obj"
-   -@erase "$(INTDIR)\tuple.obj"
-   -@erase "$(INTDIR)\tuplelist.obj"
-   -@erase "$(INTDIR)\odbcapi.obj"
-   -@erase "$(INTDIR)\descriptor.obj"
-   -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(OUTDIR)\psqlodbc25.dll"
-   -@erase "$(OUTDIR)\psqlodbc.exp"
-   -@erase "$(OUTDIR)\psqlodbc.lib"
-   -@erase "$(OUTDIR)\psqlodbc.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-!IF "$(CFG)" == "MultibyteRelease"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-!ELSE
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-!ENDIF
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc" 
-BSC32_SBRS= \
-   
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_api25.def" /out:"$(OUTDIRBIN)\psqlodbc25.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
-DEF_FILE= "psqlodbc_api25.def"
-LINK32_OBJS= \
-   "$(INTDIR)\bind.obj" \
-   "$(INTDIR)\columninfo.obj" \
-   "$(INTDIR)\connection.obj" \
-   "$(INTDIR)\convert.obj" \
-   "$(INTDIR)\dlg_specific.obj" \
-   "$(INTDIR)\dlg_wingui.obj" \
-   "$(INTDIR)\drvconn.obj" \
-   "$(INTDIR)\environ.obj" \
-   "$(INTDIR)\execute.obj" \
-   "$(INTDIR)\info.obj" \
-   "$(INTDIR)\lobj.obj" \
-   "$(INTDIR)\win_md5.obj" \
-   "$(INTDIR)\misc.obj" \
-!IF "$(CFG)" == "MultibyteRelease"
-   "$(INTDIR)\multibyte.obj" \
-!ENDIF
-   "$(INTDIR)\options.obj" \
-   "$(INTDIR)\parse.obj" \
-   "$(INTDIR)\pgtypes.obj" \
-   "$(INTDIR)\psqlodbc.obj" \
-   "$(INTDIR)\qresult.obj" \
-   "$(INTDIR)\results.obj" \
-   "$(INTDIR)\setup.obj" \
-   "$(INTDIR)\socket.obj" \
-   "$(INTDIR)\statement.obj" \
-   "$(INTDIR)\tuple.obj" \
-   "$(INTDIR)\tuplelist.obj" \
-   "$(INTDIR)\odbcapi.obj" \
-   "$(INTDIR)\descriptor.obj" \
-   "$(INTDIR)\psqlodbc.res"
-
-"$(OUTDIRBIN)\psqlodbc25.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Debug" || "$(CFG)" == "MultibyteDebug"
-
-!IF "$(CFG)" == "MultibyteDebug"
-OUTDIR=.\MultibyteDebug
-INTDIR=.\MultibyteDebug
-!ELSE
-OUTDIR=.\Debug
-INTDIR=.\Debug
-!ENDIF
-
-ALL : "$(OUTDIR)\psqlodbc25.dll"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\bind.obj"
-   -@erase "$(INTDIR)\columninfo.obj"
-   -@erase "$(INTDIR)\connection.obj"
-   -@erase "$(INTDIR)\convert.obj"
-   -@erase "$(INTDIR)\dlg_specific.obj"
-   -@erase "$(INTDIR)\dlg_wingui.obj"
-   -@erase "$(INTDIR)\drvconn.obj"
-   -@erase "$(INTDIR)\environ.obj"
-   -@erase "$(INTDIR)\execute.obj"
-   -@erase "$(INTDIR)\info.obj"
-   -@erase "$(INTDIR)\lobj.obj"
-   -@erase "$(INTDIR)\win_md5.obj"
-   -@erase "$(INTDIR)\misc.obj"
-!IF "$(CFG)" == "MultibyteDebug" 
-   -@erase "$(INTDIR)\multibyte.obj"
-!ENDIF
-   -@erase "$(INTDIR)\options.obj"
-   -@erase "$(INTDIR)\parse.obj"
-   -@erase "$(INTDIR)\pgtypes.obj"
-   -@erase "$(INTDIR)\psqlodbc.obj"
-   -@erase "$(INTDIR)\psqlodbc.res"
-   -@erase "$(INTDIR)\qresult.obj"
-   -@erase "$(INTDIR)\results.obj"
-   -@erase "$(INTDIR)\setup.obj"
-   -@erase "$(INTDIR)\socket.obj"
-   -@erase "$(INTDIR)\statement.obj"
-   -@erase "$(INTDIR)\tuple.obj"
-   -@erase "$(INTDIR)\tuplelist.obj"
-   -@erase "$(INTDIR)\odbcapi.obj"
-   -@erase "$(INTDIR)\descriptor.obj"
-   -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(INTDIR)\vc60.pdb"
-   -@erase "$(OUTDIR)\psqlodbc25.dll"
-   -@erase "$(OUTDIR)\psqlodbc.exp"
-   -@erase "$(OUTDIR)\psqlodbc.ilk"
-   -@erase "$(OUTDIR)\psqlodbc.lib"
-   -@erase "$(OUTDIR)\psqlodbc.pdb"
-   -@erase "$(OUTDIR)\psqlodbc.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-!IF "$(CFG)" == "MultibyteDebug" 
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-!ELSE
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-!ENDIF
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc" 
-BSC32_SBRS= \
-   
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_api25.def" /out:"$(OUTDIR)\psqlodbc25.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
-DEF_FILE= "psqlodbc_api25.def"
-LINK32_OBJS= \
-   "$(INTDIR)\bind.obj" \
-   "$(INTDIR)\columninfo.obj" \
-   "$(INTDIR)\connection.obj" \
-   "$(INTDIR)\convert.obj" \
-   "$(INTDIR)\dlg_specific.obj" \
-   "$(INTDIR)\dlg_wingui.obj" \
-   "$(INTDIR)\drvconn.obj" \
-   "$(INTDIR)\environ.obj" \
-   "$(INTDIR)\execute.obj" \
-   "$(INTDIR)\info.obj" \
-   "$(INTDIR)\lobj.obj" \
-   "$(INTDIR)\win_md5.obj" \
-   "$(INTDIR)\misc.obj" \
-!IF "$(CFG)" == "MultibyteDebug" 
-   "$(INTDIR)\multibyte.obj" \
-!ENDIF
-   "$(INTDIR)\options.obj" \
-   "$(INTDIR)\parse.obj" \
-   "$(INTDIR)\pgtypes.obj" \
-   "$(INTDIR)\psqlodbc.obj" \
-   "$(INTDIR)\qresult.obj" \
-   "$(INTDIR)\results.obj" \
-   "$(INTDIR)\setup.obj" \
-   "$(INTDIR)\socket.obj" \
-   "$(INTDIR)\statement.obj" \
-   "$(INTDIR)\tuple.obj" \
-   "$(INTDIR)\tuplelist.obj" \
-   "$(INTDIR)\odbcapi.obj" \
-   "$(INTDIR)\descriptor.obj" \
-   "$(INTDIR)\psqlodbc.res"
-
-"$(OUTDIR)\psqlodbc25.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-!IF "$(CFG)" == "Release" || "$(CFG)" == "Debug" || "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug"
-
-SOURCE=bind.c
-
-"$(INTDIR)\bind.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=columninfo.c
-
-"$(INTDIR)\columninfo.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=connection.c
-
-"$(INTDIR)\connection.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=convert.c
-
-"$(INTDIR)\convert.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=dlg_specific.c
-
-"$(INTDIR)\dlg_specific.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=dlg_wingui.c
-
-"$(INTDIR)\dlg_wingui.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=drvconn.c
-
-"$(INTDIR)\drvconn.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=environ.c
-
-"$(INTDIR)\environ.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=execute.c
-
-"$(INTDIR)\execute.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=info.c
-
-"$(INTDIR)\info.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=lobj.c
-
-"$(INTDIR)\lobj.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=misc.c
-
-"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" 
-
-SOURCE=multibyte.c
-
-"$(INTDIR)\multibyte.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ENDIF
-
-
-SOURCE=options.c
-
-"$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=parse.c
-
-"$(INTDIR)\parse.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=pgtypes.c
-
-"$(INTDIR)\pgtypes.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=psqlodbc.c
-
-"$(INTDIR)\psqlodbc.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=psqlodbc.rc
-
-!IF "$(CFG)" == "Release"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" $(SOURCE)
-!ENDIF
-
-!IF "$(CFG)" == "MultibyteRelease"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" /d "MULTIBYTE" $(SOURCE)
-!ENDIF
-
-!IF "$(CFG)" == "Debug"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" $(SOURCE)
-!ENDIF
-
-!IF "$(CFG)" == "MultibyteDebug"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" /d "MULTIBYTE" $(SOURCE)
-!ENDIF
-
-
-SOURCE=qresult.c
-
-"$(INTDIR)\qresult.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=results.c
-
-"$(INTDIR)\results.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=setup.c
-
-"$(INTDIR)\setup.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=socket.c
-
-"$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=statement.c
-
-"$(INTDIR)\statement.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=tuple.c
-
-"$(INTDIR)\tuple.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=tuplelist.c
-
-"$(INTDIR)\tuplelist.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=win_md5.c
-
-"$(INTDIR)\win_md5.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=odbcapi.c
-
-"$(INTDIR)\odbcapi.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=descriptor.c
-
-"$(INTDIR)\descriptor.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-
-!ENDIF 

diff --git a/win32_30w.mak b/win32_30w.mak
deleted file mode 100644 (file)
index 0a5a29b..0000000
--- a/win32_30w.mak
+++ /dev/null
@@ -1,527 +0,0 @@
-#
-# File:            win32_30w.mak
-#
-# Description:     psqlodbc30w Unicode version Makefile for Win32.
-#
-# Configurations:  Unicode30Debug, Unicode30
-# Build Types:     ALL, CLEAN
-# Usage:       NMAKE /f win32_30.mak CFG=[Unicode30 | Unicode30Debug] [ALL | CLEAN]
-#
-# Comments:        Created by Dave Page, 2001-02-12
-#
-
-!MESSAGE Building the PostgreSQL Unicode 3.0 Driver for Win32...
-!MESSAGE
-!IF "$(CFG)" == ""
-CFG=Unicode30
-!MESSAGE No configuration specified. Defaulting to Unicode30.
-!MESSAGE
-!ENDIF 
-
-!IF "$(CFG)" != "Unicode30" && "$(CFG)" != "Unicode30Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f win32_30.mak CFG=[Unicode30 | Unicode30Debug] [ALL | CLEAN]
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Unicode30" (Win32 Release DLL)
-!MESSAGE "Unicode30Debug" (Win32 Debug DLL)
-!MESSAGE 
-!ERROR An invalid configuration was specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "Unicode30"
-
-OUTDIR=.\Unicode30
-OUTDIRBIN=.\Unicode30
-INTDIR=.\Unicode30
-
-ALL : "$(OUTDIRBIN)\psqlodbc30w.dll"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\bind.obj"
-   -@erase "$(INTDIR)\columninfo.obj"
-   -@erase "$(INTDIR)\connection.obj"
-   -@erase "$(INTDIR)\convert.obj"
-   -@erase "$(INTDIR)\dlg_specific.obj"
-   -@erase "$(INTDIR)\dlg_wingui.obj"
-   -@erase "$(INTDIR)\drvconn.obj"
-   -@erase "$(INTDIR)\environ.obj"
-   -@erase "$(INTDIR)\execute.obj"
-   -@erase "$(INTDIR)\info.obj"
-   -@erase "$(INTDIR)\info30.obj"
-   -@erase "$(INTDIR)\lobj.obj"
-   -@erase "$(INTDIR)\win_md5.obj"
-   -@erase "$(INTDIR)\misc.obj"
-   -@erase "$(INTDIR)\pgapi30.obj"
-   -@erase "$(INTDIR)\multibyte.obj"
-   -@erase "$(INTDIR)\odbcapiw.obj"
-   -@erase "$(INTDIR)\odbcapi30w.obj"
-   -@erase "$(INTDIR)\win_unicode.obj"
-   -@erase "$(INTDIR)\options.obj"
-   -@erase "$(INTDIR)\parse.obj"
-   -@erase "$(INTDIR)\pgtypes.obj"
-   -@erase "$(INTDIR)\psqlodbc.obj"
-   -@erase "$(INTDIR)\psqlodbc.res"
-   -@erase "$(INTDIR)\qresult.obj"
-   -@erase "$(INTDIR)\results.obj"
-   -@erase "$(INTDIR)\setup.obj"
-   -@erase "$(INTDIR)\socket.obj"
-   -@erase "$(INTDIR)\statement.obj"
-   -@erase "$(INTDIR)\tuple.obj"
-   -@erase "$(INTDIR)\tuplelist.obj"
-   -@erase "$(INTDIR)\odbcapi.obj"
-   -@erase "$(INTDIR)\odbcapi30.obj"
-   -@erase "$(INTDIR)\descriptor.obj"
-   -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(OUTDIR)\psqlodbc30w.dll"
-   -@erase "$(OUTDIR)\psqlodbc.exp"
-   -@erase "$(OUTDIR)\psqlodbc.lib"
-   -@erase "$(OUTDIR)\psqlodbc.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc" 
-BSC32_SBRS= \
-   
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\psqlodbc.pdb" /machine:I386 /def:"psqlodbc_api30w.def" /out:"$(OUTDIRBIN)\psqlodbc30w.dll" /implib:"$(OUTDIR)\psqlodbc.lib" 
-DEF_FILE= "psqlodbc_api30w.def"
-LINK32_OBJS= \
-   "$(INTDIR)\bind.obj" \
-   "$(INTDIR)\columninfo.obj" \
-   "$(INTDIR)\connection.obj" \
-   "$(INTDIR)\convert.obj" \
-   "$(INTDIR)\dlg_specific.obj" \
-   "$(INTDIR)\dlg_wingui.obj" \
-   "$(INTDIR)\drvconn.obj" \
-   "$(INTDIR)\environ.obj" \
-   "$(INTDIR)\execute.obj" \
-   "$(INTDIR)\info.obj" \
-   "$(INTDIR)\info30.obj" \
-   "$(INTDIR)\lobj.obj" \
-   "$(INTDIR)\win_md5.obj" \
-   "$(INTDIR)\misc.obj" \
-   "$(INTDIR)\pgapi30.obj" \
-   "$(INTDIR)\multibyte.obj" \
-   "$(INTDIR)\odbcapiw.obj" \
-   "$(INTDIR)\odbcapi30w.obj" \
-   "$(INTDIR)\win_unicode.obj" \
-   "$(INTDIR)\options.obj" \
-   "$(INTDIR)\parse.obj" \
-   "$(INTDIR)\pgtypes.obj" \
-   "$(INTDIR)\psqlodbc.obj" \
-   "$(INTDIR)\qresult.obj" \
-   "$(INTDIR)\results.obj" \
-   "$(INTDIR)\setup.obj" \
-   "$(INTDIR)\socket.obj" \
-   "$(INTDIR)\statement.obj" \
-   "$(INTDIR)\tuple.obj" \
-   "$(INTDIR)\tuplelist.obj" \
-   "$(INTDIR)\odbcapi.obj" \
-   "$(INTDIR)\odbcapi30.obj" \
-   "$(INTDIR)\descriptor.obj" \
-   "$(INTDIR)\psqlodbc.res"
-
-"$(OUTDIRBIN)\psqlodbc30w.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Unicode30Debug"
-
-ALL : "$(OUTDIR)\psqlodbc30w.dll"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\bind.obj"
-   -@erase "$(INTDIR)\columninfo.obj"
-   -@erase "$(INTDIR)\connection.obj"
-   -@erase "$(INTDIR)\convert.obj"
-   -@erase "$(INTDIR)\dlg_specific.obj"
-   -@erase "$(INTDIR)\dlg_wingui.obj"
-   -@erase "$(INTDIR)\drvconn.obj"
-   -@erase "$(INTDIR)\environ.obj"
-   -@erase "$(INTDIR)\execute.obj"
-   -@erase "$(INTDIR)\info.obj"
-   -@erase "$(INTDIR)\info30.obj"
-   -@erase "$(INTDIR)\lobj.obj"
-   -@erase "$(INTDIR)\win_md5.obj"
-   -@erase "$(INTDIR)\misc.obj"
-   -@erase "$(INTDIR)\pgapi30.obj"
-   -@erase "$(INTDIR)\multibyte.obj"
-   -@erase "$(INTDIR)\odbcapiw.obj"
-   -@erase "$(INTDIR)\odbcapi30w.obj"
-   -@erase "$(INTDIR)\win_unicode.obj"
-   -@erase "$(INTDIR)\options.obj"
-   -@erase "$(INTDIR)\parse.obj"
-   -@erase "$(INTDIR)\pgtypes.obj"
-   -@erase "$(INTDIR)\psqlodbc.obj"
-   -@erase "$(INTDIR)\psqlodbc.res"
-   -@erase "$(INTDIR)\qresult.obj"
-   -@erase "$(INTDIR)\results.obj"
-   -@erase "$(INTDIR)\setup.obj"
-   -@erase "$(INTDIR)\socket.obj"
-   -@erase "$(INTDIR)\statement.obj"
-   -@erase "$(INTDIR)\tuple.obj"
-   -@erase "$(INTDIR)\tuplelist.obj"
-   -@erase "$(INTDIR)\odbcapi.obj"
-   -@erase "$(INTDIR)\odbcapi30.obj"
-   -@erase "$(INTDIR)\descriptor.obj"
-   -@erase "$(INTDIR)\vc60.idb"
-   -@erase "$(INTDIR)\vc60.pdb"
-   -@erase "$(OUTDIR)\psqlodbc30w.dll"
-   -@erase "$(OUTDIR)\psqlodbc.exp"
-   -@erase "$(OUTDIR)\psqlodbc.ilk"
-   -@erase "$(OUTDIR)\psqlodbc.lib"
-   -@erase "$(OUTDIR)\psqlodbc.pdb"
-   -@erase "$(OUTDIR)\psqlodbc.pch"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "ODBCVER=0x0300" /D "UNICODE_SUPPORT" /D "DRIVER_CURSOR_IMPLEMENT" /D "WIN_MULTITHREAD_SUPPORT" $(ADD_DEFINES) /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-RSC_PROJ=/l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\psqlodbc.bsc" 
-BSC32_SBRS= \
-   
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\psqlodbc.pdb" /debug /machine:I386 /def:"psqlodbc_api30w.def" /out:"$(OUTDIR)\psqlodbc30w.dll" /implib:"$(OUTDIR)\psqlodbc.lib" /pdbtype:sept 
-DEF_FILE= "psqlodbc_api30w.def"
-LINK32_OBJS= \
-   "$(INTDIR)\bind.obj" \
-   "$(INTDIR)\columninfo.obj" \
-   "$(INTDIR)\connection.obj" \
-   "$(INTDIR)\convert.obj" \
-   "$(INTDIR)\dlg_specific.obj" \
-   "$(INTDIR)\dlg_wingui.obj" \
-   "$(INTDIR)\drvconn.obj" \
-   "$(INTDIR)\environ.obj" \
-   "$(INTDIR)\execute.obj" \
-   "$(INTDIR)\info.obj" \
-   "$(INTDIR)\info30.obj" \
-   "$(INTDIR)\lobj.obj" \
-   "$(INTDIR)\win_md5.obj"
-   "$(INTDIR)\misc.obj" \
-   "$(INTDIR)\pgapi30.obj" \
-   "$(INTDIR)\multibyte.obj" \
-   "$(INTDIR)\odbcapiw.obj" \
-   "$(INTDIR)\odbcapi30w.obj" \
-   "$(INTDIR)\win_unicode.obj" \
-   "$(INTDIR)\options.obj" \
-   "$(INTDIR)\parse.obj" \
-   "$(INTDIR)\pgtypes.obj" \
-   "$(INTDIR)\psqlodbc.obj" \
-   "$(INTDIR)\qresult.obj" \
-   "$(INTDIR)\results.obj" \
-   "$(INTDIR)\setup.obj" \
-   "$(INTDIR)\socket.obj" \
-   "$(INTDIR)\statement.obj" \
-   "$(INTDIR)\tuple.obj" \
-   "$(INTDIR)\tuplelist.obj" \
-   "$(INTDIR)\odbcapi.obj" \
-   "$(INTDIR)\odbcapi30.obj" \
-   "$(INTDIR)\descriptor.obj" \
-   "$(INTDIR)\psqlodbc.res"
-
-"$(OUTDIR)\psqlodbc30w.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-!IF "$(CFG)" == "Unicode30" || "$(CFG)" == "Unicode30Debug"
-
-SOURCE=bind.c
-
-"$(INTDIR)\bind.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=columninfo.c
-
-"$(INTDIR)\columninfo.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=connection.c
-
-"$(INTDIR)\connection.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=convert.c
-
-"$(INTDIR)\convert.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=dlg_specific.c
-
-"$(INTDIR)\dlg_specific.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=dlg_wingui.c
-
-"$(INTDIR)\dlg_wingui.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=drvconn.c
-
-"$(INTDIR)\drvconn.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=environ.c
-
-"$(INTDIR)\environ.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=execute.c
-
-"$(INTDIR)\execute.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=info.c
-
-"$(INTDIR)\info.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=info30.c
-
-"$(INTDIR)\info30.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=lobj.c
-
-"$(INTDIR)\lobj.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=misc.c
-
-"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=multibyte.c
-
-"$(INTDIR)\multibyte.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=odbcapiw.c
-
-"$(INTDIR)\odbcapiw.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=pgapi30.c
-
-"$(INTDIR)\pgapi30.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=odbcapi30w.c
-
-"$(INTDIR)\odbcapi30w.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=win_unicode.c
-
-"$(INTDIR)\win_unicode.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=options.c
-
-"$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=parse.c
-
-"$(INTDIR)\parse.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=pgtypes.c
-
-"$(INTDIR)\pgtypes.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=psqlodbc.c
-
-"$(INTDIR)\psqlodbc.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=psqlodbc.rc
-
-!IF "$(CFG)" == "Unicode30"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" /d "MULTIBYTE" $(SOURCE)
-!ENDIF
-
-!IF "$(CFG)" == "Unicode30Debug"
-"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
-   $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" $(SOURCE)
-!ENDIF
-
-
-SOURCE=qresult.c
-
-"$(INTDIR)\qresult.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=results.c
-
-"$(INTDIR)\results.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=setup.c
-
-"$(INTDIR)\setup.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=socket.c
-
-"$(INTDIR)\socket.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=statement.c
-
-"$(INTDIR)\statement.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=tuple.c
-
-"$(INTDIR)\tuple.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=tuplelist.c
-
-"$(INTDIR)\tuplelist.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=win_md5.c
-
-"$(INTDIR)\win_md5.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=odbcapi.c
-
-"$(INTDIR)\odbcapi.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=odbcapi30.c
-
-"$(INTDIR)\odbcapi30.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-SOURCE=descriptor.c
-
-"$(INTDIR)\descriptor.obj" : $(SOURCE) "$(INTDIR)"
-   $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF