Add new Win32 file with adjustments for recent code changes.

Andreas Pflug

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index de6c140..16b4fd0 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -1,7 +1,7 @@
 # Makefile for Microsoft Visual C++ 5.0 (or compat)
 
-# Will build a Win32 static library libpq(d).lib\r
-#        and a Win32 dynamic library libpq(d).dll with import library libpq(d)dll.lib\r
+# Will build a Win32 static library libpq(d).lib
+#        and a Win32 dynamic library libpq(d).dll with import library libpq(d)dll.lib
 # USE_SSL=1 will compile with OpenSSL
 # DEBUG=1 compiles with debugging symbols
 
@@ -10,15 +10,15 @@
 !MESSAGE
 
 !IFDEF DEBUG
-OPT=/Od /Zi /MDd\r
-LOPT=/debug
+OPT=/Od /Zi /MDd
+LOPT=/DEBUG
 DEBUGDEF=/D _DEBUG
-OUTFILENAME=libpqd\r
+OUTFILENAME=libpqd
 !ELSE
-OPT=/O2 /MD\r
+OPT=/O2 /MD
 LOPT=
 DEBUGDEF=/D NDEBUG
-OUTFILENAME=libpq\r
+OUTFILENAME=libpq
 !ENDIF
 
 !IF "$(OS)" == "Windows_NT"
@@ -41,15 +41,15 @@ CPP_OBJS=.\Release/
 !ENDIF
 
 
-ALL : "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" \r
+ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" 
 
 CLEAN :
        -@erase "$(INTDIR)\getaddrinfo.obj"
+       -@erase "$(INTDIR)\pgstrcasecmp.obj"
        -@erase "$(INTDIR)\thread.obj"
        -@erase "$(INTDIR)\inet_aton.obj"
        -@erase "$(INTDIR)\crypt.obj"
        -@erase "$(INTDIR)\noblock.obj"
-       -@erase "$(INTDIR)\path.obj"
        -@erase "$(INTDIR)\dllist.obj"
        -@erase "$(INTDIR)\md5.obj"
        -@erase "$(INTDIR)\ip.obj"
@@ -65,20 +65,28 @@ CLEAN :
        -@erase "$(INTDIR)\pqexpbuffer.obj"
        -@erase "$(OUTDIR)\libpqdll.obj"
        -@erase "$(OUTDIR)\win32.obj"
-       -@erase "$(OUTDIR)\$(OUTFILENAME).lib"\r
-       -@erase "$(OUTDIR)\$(OUTFILENAME).dll"\r
+       -@erase "$(OUTDIR)\$(OUTFILENAME).lib"
+       -@erase "$(OUTDIR)\$(OUTFILENAME).dll"
        -@erase "$(OUTDIR)\libpq.res"
        -@erase "*.pch"
        -@erase "$(OUTDIR)\libpq.pch"
-       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"\r
-       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"\r
+       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
+       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
        -@erase "$(INTDIR)\wchar.obj"
        -@erase "$(INTDIR)\encnames.obj"
 
+
+
+config: ..\..\include\pg_config.h
+
+..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
+       copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
+
+
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /D "FRONTEND" $(DEBUGDEF) /D\\r
+CPP_PROJ=/nologo /W3 /GX $(OPT) /I "..\..\include" /D "FRONTEND" $(DEBUGDEF) /D\
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
 
@@ -90,15 +98,15 @@ SSL_LIBS=ssleay32.lib libeay32.lib gdi32.lib
 CPP_SBRS=.
 
 LIB32=link.exe -lib
-LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib" \r
+LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib" 
 LIB32_OBJS= \
        "$(INTDIR)\win32.obj" \
        "$(INTDIR)\getaddrinfo.obj" \
+       "$(INTDIR)\pgstrcasecmp.obj" \
        "$(INTDIR)\thread.obj" \
        "$(INTDIR)\inet_aton.obj" \
         "$(INTDIR)\crypt.obj" \
        "$(INTDIR)\noblock.obj" \
-       "$(INTDIR)\path.obj" \
        "$(INTDIR)\dllist.obj" \
        "$(INTDIR)\md5.obj" \
        "$(INTDIR)\ip.obj" \
@@ -121,15 +129,15 @@ RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
 LINK32=link.exe
 LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib wsock32.lib $(SSL_LIBS)  \
  /nologo /subsystem:windows /dll $(LOPT) /incremental:no\
- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\\r
- /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def\r
+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:I386 /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
+ /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  /def:$(OUTFILENAME)dll.def
 LINK32_OBJS= \
        "$(INTDIR)\libpqdll.obj" \
-       "$(OUTDIR)\$(OUTFILENAME).lib" \\r
+       "$(OUTDIR)\$(OUTFILENAME).lib" \
        "$(OUTDIR)\libpq.res"
 
 
-"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)\r
+"$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
     $(LIB32) @<<
   $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
 <<
@@ -138,7 +146,7 @@ LINK32_OBJS= \
     $(RSC) $(RSC_PROJ) libpq.rc
 
 
-"$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" "$(INTDIR)\libpq.res"\r
+"$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(OUTDIR)\libpqdll.obj" "$(INTDIR)\libpqdll.obj" "$(INTDIR)\libpq.res"
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
@@ -148,6 +156,11 @@ LINK32_OBJS= \
     $(CPP_PROJ) ..\..\port\getaddrinfo.c
 <<
 
+"$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
+    $(CPP) @<<
+    $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
+<<
+
 "$(INTDIR)\thread.obj" : ..\..\port\thread.c
     $(CPP) @<<
     $(CPP_PROJ) ..\..\port\thread.c
@@ -168,11 +181,6 @@ LINK32_OBJS= \
     $(CPP_PROJ) ..\..\port\noblock.c
 <<
 
-"$(INTDIR)\path.obj" : ..\..\port\path.c
-    $(CPP) @<<
-    $(CPP_PROJ) ..\..\port\path.c
-<<
-
 "$(INTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c
     $(CPP) @<<
     $(CPP_PROJ) ..\..\backend\lib\dllist.c