*** bcc32.mak	Sun Nov 30 01:01:15 2003
--- /users/pgman/bcc32.mak	Sun Jul 25 21:57:20 2004
***************
*** 4,10 ****
  #        and a Win32 dynamic library libpq.dll with import library libpqdll.lib
  
  # Borland C++ base install directory goes here
! # BCB=d:\Borland\Bcc55
  
  !MESSAGE Building the Win32 DLL and Static Library...
  !MESSAGE
--- 4,10 ----
  #        and a Win32 dynamic library libpq.dll with import library libpqdll.lib
  
  # Borland C++ base install directory goes here
! BCB=c:\Borland\Bcc55
  
  !MESSAGE Building the Win32 DLL and Static Library...
  !MESSAGE
***************
*** 56,62 ****
  !IFDEF DEBUG
  CPP_PROJ	= $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
  !else
! CPP_PROJ	= $(CPP_PROJ) -O -Oi -OS -DNDEBUG
  !endif
  
  LIB32=tlib.exe
--- 56,62 ----
  !IFDEF DEBUG
  CPP_PROJ	= $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
  !else
! CPP_PROJ        = $(CPP_PROJ) -O -Oi -OS -DNDEBU
  !endif
  
  LIB32=tlib.exe
***************
*** 68,73 ****
--- 68,75 ----
  	"$(INTDIR)\inet_aton.obj" \
  	"$(INTDIR)\crypt.obj" \
  	"$(INTDIR)\path.obj" \
+         "$(INTDIR)\noblock.obj" \
+         "$(INTDIR)\pgstrcasecmp.obj" \
  	"$(INTDIR)\dllist.obj" \
  	"$(INTDIR)\md5.obj" \
  	"$(INTDIR)\ip.obj" \
***************
*** 82,88 ****
  	"$(INTDIR)\fe-secure.obj" \
  	"$(INTDIR)\pqexpbuffer.obj" \
  	"$(INTDIR)\wchar.obj" \
! 	"$(INTDIR)\encnames.obj"
  
  RSC=brcc32.exe
  RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
--- 84,91 ----
  	"$(INTDIR)\fe-secure.obj" \
  	"$(INTDIR)\pqexpbuffer.obj" \
  	"$(INTDIR)\wchar.obj" \
!         "$(INTDIR)\encnames.obj"
! 
  
  RSC=brcc32.exe
  RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
***************
*** 98,104 ****
  
  # ---------------------------------------------------------------------------
  
! ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
  
  CLEAN :
  	-@erase "$(INTDIR)\getaddrinfo.obj"
--- 101,107 ----
  
  # ---------------------------------------------------------------------------
  
! ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
  
  CLEAN :
  	-@erase "$(INTDIR)\getaddrinfo.obj"
***************
*** 123,134 ****
--- 126,149 ----
  	-@erase "$(OUTDIR)\win32.obj"
  	-@erase "$(INTDIR)\wchar.obj"
  	-@erase "$(INTDIR)\encnames.obj"
+         -@erase "$(INTDIR)\noblock.obj"
+         -@erase "$(INTDIR)\pgstrcasecmp.obj"
  	-@erase "$(OUTDIR)\libpq.res"
  	-@erase "$(OUTDIR)\blibpq.lib"
  	-@erase "$(OUTDIR)\blibpqdll.lib"
  	-@erase "$(OUTDIR)\blibpq.dll"
  	-@erase "$(OUTDIR)\blibpq.tds"
  
+ config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
+ 
+ ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
+ 	copy ..\..\include\pg_config.h.win32 ..\..\include\pg_config.h
+ 
+ pthread.h: pthread.h.win32
+ 	copy pthread.h.win32 pthread.h
+ 
+ pg_config_paths.h: win32.mak
+ 	echo #define SYSCONFDIR "" >pg_config_paths.h
  
  "$(OUTDIR)" :
  	@if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
***************
*** 136,144 ****
  "$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def 
  	$(LINK32) @&&!
  	$(LINK32_FLAGS) +
! 	c0d32.obj $(LINK32_OBJS), +
  	$@,, +
! 	"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
  	blibpqdll.def,"$(INTDIR)\libpq.res"
  !
  	implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
--- 151,159 ----
  "$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def 
  	$(LINK32) @&&!
  	$(LINK32_FLAGS) +
!         c0d32.obj $(LINK32_OBJS), +
  	$@,, +
!         "$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
  	blibpqdll.def,"$(INTDIR)\libpq.res"
  !
  	implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
***************
*** 151,156 ****
--- 166,172 ----
  +-"$(**: =" &^
  +-")"
  !
+ 
  
  .c.obj:
  	$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
*** win32.h	Thu May  6 20:57:59 2004
--- /users/pgman/win32.h	Sun Jul 25 21:57:26 2004
***************
*** 8,13 ****
--- 8,14 ----
  #define _timeb timeb
  #define _ftime(a) ftime(a)
  #define _errno errno
+ #define popen(a,b) _popen(a,b)
  #else
  /* open provided elsewhere */
  #define close(a) _close(a)