> The win32.mak and libpgtcl.def files had been lost (patch doesn't handle

> new files). I'm attaching those two files below.
>
> Regards
> Mikhail Terekhov

diff --git a/src/interfaces/libpgtcl.def b/src/interfaces/libpgtcl/libpgtcl.def
similarity index 95%
rename from src/interfaces/libpgtcl.def
rename to src/interfaces/libpgtcl/libpgtcl.def
index 0ecc5ea0319a5ddfa0f5dfc5ec83d6252f279686..c4b45f2b617db0620e727fae85bcba5f20c88767 100644 (file)
--- a/src/interfaces/libpgtcl.def
+++ b/src/interfaces/libpgtcl/libpgtcl.def
@@ -1,8 +1,8 @@
-;libpgtcl.def
-; The LIBRARY entry must be same as the name of your DLL, the name of 
-; our DLL is libpgtcl.dll
-LIBRARY libpgtcl
-EXPORTS 
-   
-       Pgtcl_Init  
-       Pgtcl_SafeInit
+;libpgtcl.def\r
+; The LIBRARY entry must be same as the name of your DLL, the name of \r
+; our DLL is libpgtcl.dll\r
+LIBRARY libpgtcl\r
+EXPORTS \r
+   \r
+       Pgtcl_Init  \r
+       Pgtcl_SafeInit\r

diff --git a/src/interfaces/win32.mak b/src/interfaces/libpgtcl/win32.mak
similarity index 96%
rename from src/interfaces/win32.mak
rename to src/interfaces/libpgtcl/win32.mak
index bbd11b2c33c218fdfaf94b209c52a06bc456cf06..314606750851c0752489765431a3661015f121d7 100644 (file)
--- a/src/interfaces/win32.mak
+++ b/src/interfaces/libpgtcl/win32.mak
@@ -1,201 +1,201 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libpgtcl_REL7_1_STABLE.dsp
-!IF "$(CFG)" == ""
-CFG=libpgtcl - Win32 Release
-!MESSAGE No configuration specified. Defaulting to libpgtcl - Win32 Release.
-!ENDIF 
-
-!IF "$(CFG)" != "libpgtcl - Win32 Release" && "$(CFG)" != "libpgtcl - Win32 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 "libpgtcl.mak" CFG="libpgtcl - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libpgtcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libpgtcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-TCLBASE=\usr\local\tcltk833
-PGINCLUDE=/I ..\..\include /I ..\libpq /I $(TCLBASE)\include
-
-!IF  "$(CFG)" == "libpgtcl - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\libpgtcl.dll" "$(OUTDIR)\libpgtcl.bsc"
-
-
-CLEAN :
-       -@erase "$(INTDIR)\pgtcl.obj"
-       -@erase "$(INTDIR)\pgtcl.sbr"
-       -@erase "$(INTDIR)\pgtclCmds.obj"
-       -@erase "$(INTDIR)\pgtclCmds.sbr"
-       -@erase "$(INTDIR)\pgtclId.obj"
-       -@erase "$(INTDIR)\pgtclId.sbr"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(OUTDIR)\libpgtcl.dll"
-       -@erase "$(OUTDIR)\libpgtcl.exp"
-       -@erase "$(OUTDIR)\libpgtcl.lib"
-       -@erase "$(OUTDIR)\libpgtcl.bsc"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MT /W3 /GX /O2 $(PGINCLUDE) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libpgtcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libpgtcl.bsc" 
-BSC32_SBRS= \
-       "$(INTDIR)\pgtcl.sbr" \
-       "$(INTDIR)\pgtclCmds.sbr" \
-       "$(INTDIR)\pgtclId.sbr"
-
-"$(OUTDIR)\libpgtcl.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(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 tcl83.lib libpq.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libpgtcl.pdb" /machine:I386 /def:".\libpgtcl.def" /out:"$(OUTDIR)\libpgtcl.dll" /implib:"$(OUTDIR)\libpgtcl.lib" /libpath:"$(TCLBASE)\lib" /libpath:"..\libpq\Release" 
-DEF_FILE= \
-       ".\libpgtcl.def"
-LINK32_OBJS= \
-       "$(INTDIR)\pgtcl.obj" \
-       "$(INTDIR)\pgtclCmds.obj" \
-       "$(INTDIR)\pgtclId.obj"
-
-"$(OUTDIR)\libpgtcl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "libpgtcl - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\libpgtcl.dll" "$(OUTDIR)\libpgtcl.bsc"
-
-
-CLEAN :
-       -@erase "$(INTDIR)\pgtcl.obj"
-       -@erase "$(INTDIR)\pgtcl.sbr"
-       -@erase "$(INTDIR)\pgtclCmds.obj"
-       -@erase "$(INTDIR)\pgtclCmds.sbr"
-       -@erase "$(INTDIR)\pgtclId.obj"
-       -@erase "$(INTDIR)\pgtclId.sbr"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(INTDIR)\vc60.pdb"
-       -@erase "$(OUTDIR)\libpgtcl.dll"
-       -@erase "$(OUTDIR)\libpgtcl.exp"
-       -@erase "$(OUTDIR)\libpgtcl.ilk"
-       -@erase "$(OUTDIR)\libpgtcl.lib"
-       -@erase "$(OUTDIR)\libpgtcl.pdb"
-       -@erase "$(OUTDIR)\libpgtcl.bsc"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od $(PGINCLUDE) /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libpgtcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libpgtcl.bsc" 
-BSC32_SBRS= \
-       "$(INTDIR)\pgtcl.sbr" \
-       "$(INTDIR)\pgtclCmds.sbr" \
-       "$(INTDIR)\pgtclId.sbr"
-
-"$(OUTDIR)\libpgtcl.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=tcl83.lib libpq.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libpgtcl.pdb" /debug /machine:I386 /def:".\libpgtcl.def" /out:"$(OUTDIR)\libpgtcl.dll" /implib:"$(OUTDIR)\libpgtcl.lib" /pdbtype:sept /libpath:"$(TCLBASE)\lib" /libpath:"..\libpq\Debug" 
-DEF_FILE= \
-       ".\libpgtcl.def"
-LINK32_OBJS= \
-       "$(INTDIR)\pgtcl.obj" \
-       "$(INTDIR)\pgtclCmds.obj" \
-       "$(INTDIR)\pgtclId.obj"
-
-"$(OUTDIR)\libpgtcl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!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) $< 
-<<
-
-!IF "$(CFG)" == "libpgtcl - Win32 Release" || "$(CFG)" == "libpgtcl - Win32 Debug"
-SOURCE=pgtcl.c
-
-"$(INTDIR)\pgtcl.obj"  "$(INTDIR)\pgtcl.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=pgtclCmds.c
-
-"$(INTDIR)\pgtclCmds.obj"      "$(INTDIR)\pgtclCmds.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=pgtclId.c
-
-"$(INTDIR)\pgtclId.obj"        "$(INTDIR)\pgtclId.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
+# Microsoft Developer Studio Generated NMAKE File, Based on libpgtcl_REL7_1_STABLE.dsp\r
+!IF "$(CFG)" == ""\r
+CFG=libpgtcl - Win32 Release\r
+!MESSAGE No configuration specified. Defaulting to libpgtcl - Win32 Release.\r
+!ENDIF \r
+\r
+!IF "$(CFG)" != "libpgtcl - Win32 Release" && "$(CFG)" != "libpgtcl - Win32 Debug"\r
+!MESSAGE Invalid configuration "$(CFG)" specified.\r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "libpgtcl.mak" CFG="libpgtcl - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "libpgtcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "libpgtcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+!ERROR An invalid configuration is specified.\r
+!ENDIF \r
+\r
+!IF "$(OS)" == "Windows_NT"\r
+NULL=\r
+!ELSE \r
+NULL=nul\r
+!ENDIF \r
+\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+TCLBASE=\usr\local\tcltk833\r
+PGINCLUDE=/I ..\..\include /I ..\libpq /I $(TCLBASE)\include\r
+\r
+!IF  "$(CFG)" == "libpgtcl - Win32 Release"\r
+\r
+OUTDIR=.\Release\r
+INTDIR=.\Release\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+ALL : "$(OUTDIR)\libpgtcl.dll" "$(OUTDIR)\libpgtcl.bsc"\r
+\r
+\r
+CLEAN :\r
+       -@erase "$(INTDIR)\pgtcl.obj"\r
+       -@erase "$(INTDIR)\pgtcl.sbr"\r
+       -@erase "$(INTDIR)\pgtclCmds.obj"\r
+       -@erase "$(INTDIR)\pgtclCmds.sbr"\r
+       -@erase "$(INTDIR)\pgtclId.obj"\r
+       -@erase "$(INTDIR)\pgtclId.sbr"\r
+       -@erase "$(INTDIR)\vc60.idb"\r
+       -@erase "$(OUTDIR)\libpgtcl.dll"\r
+       -@erase "$(OUTDIR)\libpgtcl.exp"\r
+       -@erase "$(OUTDIR)\libpgtcl.lib"\r
+       -@erase "$(OUTDIR)\libpgtcl.bsc"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP_PROJ=/nologo /MT /W3 /GX /O2 $(PGINCLUDE) /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libpgtcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libpgtcl.bsc" \r
+BSC32_SBRS= \\r
+       "$(INTDIR)\pgtcl.sbr" \\r
+       "$(INTDIR)\pgtclCmds.sbr" \\r
+       "$(INTDIR)\pgtclId.sbr"\r
+\r
+"$(OUTDIR)\libpgtcl.bsc" : "$(OUTDIR)" $(BSC32_SBRS)\r
+    $(BSC32) @<<\r
+  $(BSC32_FLAGS) $(BSC32_SBRS)\r
+<<\r
+\r
+LINK32=link.exe\r
+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 tcl83.lib libpq.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libpgtcl.pdb" /machine:I386 /def:".\libpgtcl.def" /out:"$(OUTDIR)\libpgtcl.dll" /implib:"$(OUTDIR)\libpgtcl.lib" /libpath:"$(TCLBASE)\lib" /libpath:"..\libpq\Release" \r
+DEF_FILE= \\r
+       ".\libpgtcl.def"\r
+LINK32_OBJS= \\r
+       "$(INTDIR)\pgtcl.obj" \\r
+       "$(INTDIR)\pgtclCmds.obj" \\r
+       "$(INTDIR)\pgtclId.obj"\r
+\r
+"$(OUTDIR)\libpgtcl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+!ELSEIF  "$(CFG)" == "libpgtcl - Win32 Debug"\r
+\r
+OUTDIR=.\Debug\r
+INTDIR=.\Debug\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+ALL : "$(OUTDIR)\libpgtcl.dll" "$(OUTDIR)\libpgtcl.bsc"\r
+\r
+\r
+CLEAN :\r
+       -@erase "$(INTDIR)\pgtcl.obj"\r
+       -@erase "$(INTDIR)\pgtcl.sbr"\r
+       -@erase "$(INTDIR)\pgtclCmds.obj"\r
+       -@erase "$(INTDIR)\pgtclCmds.sbr"\r
+       -@erase "$(INTDIR)\pgtclId.obj"\r
+       -@erase "$(INTDIR)\pgtclId.sbr"\r
+       -@erase "$(INTDIR)\vc60.idb"\r
+       -@erase "$(INTDIR)\vc60.pdb"\r
+       -@erase "$(OUTDIR)\libpgtcl.dll"\r
+       -@erase "$(OUTDIR)\libpgtcl.exp"\r
+       -@erase "$(OUTDIR)\libpgtcl.ilk"\r
+       -@erase "$(OUTDIR)\libpgtcl.lib"\r
+       -@erase "$(OUTDIR)\libpgtcl.pdb"\r
+       -@erase "$(OUTDIR)\libpgtcl.bsc"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od $(PGINCLUDE) /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libpgtcl.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libpgtcl.bsc" \r
+BSC32_SBRS= \\r
+       "$(INTDIR)\pgtcl.sbr" \\r
+       "$(INTDIR)\pgtclCmds.sbr" \\r
+       "$(INTDIR)\pgtclId.sbr"\r
+\r
+"$(OUTDIR)\libpgtcl.bsc" : "$(OUTDIR)" $(BSC32_SBRS)\r
+    $(BSC32) @<<\r
+  $(BSC32_FLAGS) $(BSC32_SBRS)\r
+<<\r
+\r
+LINK32=link.exe\r
+LINK32_FLAGS=tcl83.lib libpq.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libpgtcl.pdb" /debug /machine:I386 /def:".\libpgtcl.def" /out:"$(OUTDIR)\libpgtcl.dll" /implib:"$(OUTDIR)\libpgtcl.lib" /pdbtype:sept /libpath:"$(TCLBASE)\lib" /libpath:"..\libpq\Debug" \r
+DEF_FILE= \\r
+       ".\libpgtcl.def"\r
+LINK32_OBJS= \\r
+       "$(INTDIR)\pgtcl.obj" \\r
+       "$(INTDIR)\pgtclCmds.obj" \\r
+       "$(INTDIR)\pgtclId.obj"\r
+\r
+"$(OUTDIR)\libpgtcl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+!ENDIF \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+!IF "$(CFG)" == "libpgtcl - Win32 Release" || "$(CFG)" == "libpgtcl - Win32 Debug"\r
+SOURCE=pgtcl.c\r
+\r
+"$(INTDIR)\pgtcl.obj"  "$(INTDIR)\pgtcl.sbr" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+SOURCE=pgtclCmds.c\r
+\r
+"$(INTDIR)\pgtclCmds.obj"      "$(INTDIR)\pgtclCmds.sbr" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+SOURCE=pgtclId.c\r
+\r
+"$(INTDIR)\pgtclId.obj"        "$(INTDIR)\pgtclId.sbr" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+\r
+!ENDIF \r
+\r