1
0
mirror of https://github.com/postgres/postgres.git synced 2025-08-18 12:22:09 +03:00

Backpatch BCC compile changes to 8.0.X for psql.

This commit is contained in:
Bruce Momjian
2005-04-29 13:42:24 +00:00
parent 95cb42b968
commit 5f9d19cc23
2 changed files with 85 additions and 74 deletions

View File

@@ -1,7 +1,17 @@
# Makefile for Borland C++ 5.5 # Makefile for Borland C++ 5.5
# Borland C++ base install directory goes here # Borland C++ base install directory goes here
# BCB=d:\Borland\Bcc55 # BCB=c:\Borland\Bcc55
!IF "$(BCB)" == ""
!MESSAGE You must edit bcc32.mak and define BCB at the top
!ERROR missing BCB
!ENDIF
!IF "$(__NMAKE__)" == ""
!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
!ERROR missing -N
!ENDIF
!MESSAGE Building PSQL.EXE ... !MESSAGE Building PSQL.EXE ...
!MESSAGE !MESSAGE
@@ -20,7 +30,7 @@ CFG=Release
!MESSAGE You can specify a configuration when running MAKE !MESSAGE You can specify a configuration when running MAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE make -DCFG=[Release | Debug] /f bcc32.mak !MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
@@ -50,10 +60,29 @@ INTDIR=.\Release
!endif !endif
REFDOCDIR=../../../doc/src/sgml/ref REFDOCDIR=../../../doc/src/sgml/ref
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \
-c -D$(USERDEFINES) -DFRONTEND -n"$(INTDIR)" -tWM -tWC -q -5 -a8 -pc -X -w-use \
-w-par -w-pia -w-csu -w-aus -w-ccc
!IFDEF DEBUG
CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
LIBPG_DIR = Debug
!ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
LIBPG_DIR = Release
!ENDIF
!IFDEF DLL_LIBS
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
!ELSE
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
!ENDIF
.path.obj = $(INTDIR) .path.obj = $(INTDIR)
.c.obj: USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe" ALL : sql_help.h psqlscan.c "..\..\port\pg_config_paths.h" "$(OUTDIR)\psql.exe"
@@ -87,80 +116,58 @@ CLEAN :
-@erase "$(OUTDIR)\psql.exe" -@erase "$(OUTDIR)\psql.exe"
-@erase "$(INTDIR)\..\..\port\pg_config_paths.h" -@erase "$(INTDIR)\..\..\port\pg_config_paths.h"
"..\..\port\pg_config_paths.h": win32.mak
echo #define PGBINDIR "" >$@
echo #define PGSHAREDIR "" >>$@
echo #define SYSCONFDIR "" >>$@
echo #define INCLUDEDIR "" >>$@
echo #define PKGINCLUDEDIR "" >>$@
echo #define INCLUDEDIRSERVER "" >>$@
echo #define LIBDIR "" >>$@
echo #define PKGLIBDIR "" >>$@
echo #define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
USERDEFINES = WIN32;_CONSOLE;_MBCS;HAVE_STRDUP
# ---------------------------------------------------------------------------
CPP_PROJ = -I$(BCB)\include;..\..\include;..\..\interfaces\libpq;..\..\include\port\win32 \
-c -D$(USERDEFINES) -DFRONTEND -tWM -tWC -q -5 -a8 -pc -X -w-use -w-par -w-pia \
-w-csu -w-aus -w-ccc
!IFDEF DEBUG
CPP_PROJ = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
LIBPG_DIR = Debug
!ELSE
CPP_PROJ = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
LIBPG_DIR = Release
!ENDIF
!IFDEF DLL_LIBS
CPP_PROJ = $(CPP_PROJ) -D_RTLDLL
LIBRARIES = cw32mti.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpqdll.lib
!ELSE
CPP_PROJ = $(CPP_PROJ) -DBCC32_STATIC
LIBRARIES = cw32mt.lib ..\..\interfaces\libpq\$(LIBPG_DIR)\blibpq.lib
!ENDIF
LINK32=ilink32.exe LINK32=ilink32.exe
LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v LINK32_FLAGS=-L$(BCB)\lib;.\$(LIBPG_DIR) -x -v
LINK32_OBJS= \ LINK32_OBJS= \
command.obj \ "$(INTDIR)\command.obj" \
common.obj \ "$(INTDIR)\common.obj" \
copy.obj \ "$(INTDIR)\copy.obj" \
describe.obj \ "$(INTDIR)\describe.obj" \
help.obj \ "$(INTDIR)\help.obj" \
input.obj \ "$(INTDIR)\input.obj" \
large_obj.obj \ "$(INTDIR)\large_obj.obj" \
mainloop.obj \ "$(INTDIR)\mainloop.obj" \
mbprint.obj "$(INTDIR)\mbprint.obj" \
print.obj \ "$(INTDIR)\print.obj" \
prompt.obj \ "$(INTDIR)\prompt.obj" \
startup.obj \ "$(INTDIR)\psqlscan.obj" \
stringutils.obj \ "$(INTDIR)\startup.obj" \
tab-complete.obj \ "$(INTDIR)\stringutils.obj" \
variables.obj \ "$(INTDIR)\tab-complete.obj" \
exec.obj \ "$(INTDIR)\variables.obj" \
getopt.obj \ "$(INTDIR)\exec.obj" \
getopt_long.obj \ "$(INTDIR)\getopt.obj" \
path.obj \ "$(INTDIR)\getopt_long.obj" \
pgstrcasecmp.obj \ "$(INTDIR)\path.obj" \
sprompt.obj \ "$(INTDIR)\pgstrcasecmp.obj" \
"$(INTDIR)\sprompt.obj"
!IFDEF DEBUG !IFDEF DEBUG
"..\..\interfaces\libpq\Debug\libpqddll.lib" LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Debug\blibpqddll.lib"
!ELSE !ELSE
"..\..\interfaces\libpq\Release\libpqdll.lib" LINK32_OBJS = $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib"
!ENDIF !ENDIF
"..\..\port\pg_config_paths.h": win32.mak
echo \#define PGBINDIR "" >$@
echo \#define PGSHAREDIR "" >>$@
echo \#define SYSCONFDIR "" >>$@
echo \#define INCLUDEDIR "" >>$@
echo \#define PKGINCLUDEDIR "" >>$@
echo \#define INCLUDEDIRSERVER "" >>$@
echo \#define LIBDIR "" >>$@
echo \#define PKGLIBDIR "" >>$@
echo \#define LOCALEDIR "" >>$@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS) "$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(LINK32_OBJS)
$(LINK32) @&&! $(LINK32) @&&!
$(LINK32_FLAGS) + $(LINK32_FLAGS) +
c0x32.obj $(LINK32_OBJS), + c0x32.obj $(LINK32_OBJS), +
$@,, + $@,, +
import32.lib $(LIBRARIES) import32.lib $(LIBRARIES),,
! !
"$(INTDIR)\exec.obj" : ..\..\port\exec.c "$(INTDIR)\exec.obj" : ..\..\port\exec.c
@@ -168,17 +175,17 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\exec.c $(CPP_PROJ) ..\..\port\exec.c
<< <<
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\port\getopt.c "$(INTDIR)\getopt.obj" : "$(INTDIR)" ..\..\port\getopt.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt.c $(CPP_PROJ) ..\..\port\getopt.c
<< <<
"$(OUTDIR)\getopt_long.obj" : "$(OUTDIR)" ..\..\port\getopt_long.c "$(INTDIR)\getopt_long.obj" : "$(INTDIR)" ..\..\port\getopt_long.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\getopt_long.c $(CPP_PROJ) ..\..\port\getopt_long.c
<< <<
"$(OUTDIR)\path.obj" : "$(OUTDIR)" ..\..\port\path.c "$(INTDIR)\path.obj" : "$(INTDIR)" ..\..\port\path.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\path.c $(CPP_PROJ) ..\..\port\path.c
<< <<
@@ -188,7 +195,7 @@ LINK32_OBJS= \
$(CPP_PROJ) ..\..\port\pgstrcasecmp.c $(CPP_PROJ) ..\..\port\pgstrcasecmp.c
<< <<
"$(OUTDIR)\sprompt.obj" : "$(OUTDIR)" ..\..\port\sprompt.c "$(INTDIR)\sprompt.obj" : "$(INTDIR)" ..\..\port\sprompt.c
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) ..\..\port\sprompt.c $(CPP_PROJ) ..\..\port\sprompt.c
<< <<
@@ -198,3 +205,7 @@ LINK32_OBJS= \
psqlscan.c : psqlscan.l psqlscan.c : psqlscan.l
$(FLEX) -Cfe -opsqlscan.c psqlscan.l $(FLEX) -Cfe -opsqlscan.c psqlscan.l
.c.obj:
$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<

View File

@@ -5,14 +5,14 @@
* *
* Copyright (c) 2004-2005, PostgreSQL Global Development Group * Copyright (c) 2004-2005, PostgreSQL Global Development Group
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.4 2005/01/01 20:44:31 tgl Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.4.4.1 2005/04/29 13:42:24 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <windows.h> #include <windows.h>
#include <pthread.h> #include "pthread.h"
HANDLE HANDLE
pthread_self() pthread_self()