9 files changed, 8 insertions, 95 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 59e1168d270..433982ade01 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -1248,11 +1248,6 @@ Set the environment variable below to build a version of ACE with
 Codeguard support. Should only be used when DEBUG is also set<br>
       <code>set CODEGUARD=1</code><br>
       <br>
-Set the environment variable below to build a version of ACE that is
-build against the VCL-compatible run-time library. This can only be
-used with BCB version 4<br>
-      <code>set PASCAL=1</code><br>
-      <br>
       Set the environment variable below to build a version of ACE using the
       C++BuilderX preview compiler. This compiler isn't supported at this moment
       but by setting this environment variable the new compiler is used and
@@ -1263,7 +1258,7 @@ used with BCB version 4<br>
       <br><code>make -f Makefile.bor</code><br>
       <br>
       You may also enable the options by passing them as command line options to make, for example:<br>
-      <code>make -f Makefile.bor -DDEBUG -DPASCAL</code><br>
+      <code>make -f Makefile.bor -DDEBUG</code><br>
       <br>
   </li><li>Optionally install the ACE header files, libraries and executables
 for use
@@ -1278,17 +1273,6 @@ see <a href="http://www.tenermerx.com/tao_bcb/index.html">http://www.tenermerx.c
 for more detailed information on building and using ACE+TAO with Borland C++
 Builder. <p>
 
-If you are using C++Builder 4, then the libraries built using the above
-instructions are intended for use with generic console or windows applications
-and they link against the corresponding C++ runtime library. VCL applications
-created using BCB4's RAD environment must link against the VCL-compatible (ie
-pascal-compatible) runtime library.  To tell the difference between these
-libraries the VCL-compatible ones have a 'p' in the suffix (i.e., 'p' for
-pascal).  To build VCL compatible libraries try
-</p><blockquote><pre><code>set PASCAL=1
-make -f Makefile.bor
-</code></pre></blockquote> <p>
-
 The Borland C++ Builder 4.0/5.0/6.0 port has been done by <a href="mailto:jody@atdesk.com">Jody Hagins</a>, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
 
 <b>ACE TESTS</b></p><p>
diff --git a/bin/MakeProjectCreator/templates/bor.mpd b/bin/MakeProjectCreator/templates/bor.mpd
index 74871002704..a34e1bcd046 100644
--- a/bin/MakeProjectCreator/templates/bor.mpd
+++ b/bin/MakeProjectCreator/templates/bor.mpd
@@ -160,7 +160,6 @@ INSTALL_THIS_TARGET = 1
 <%marker(macros)%>
 STATIC_DIR=.
 DEBUG_DIR=.
-PASCAL_DIR=.
 UNICODE_DIR=.
 
 INSTALL_DLLDIR=$(INSTALL_DIR)\lib
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index c79e8775747..fd51d933706 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -10,7 +10,6 @@
 # CPPDIR - list	of directories containing source files
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode dll
 #
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index e64eb9cf4b6..aeb65a595c6 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -11,7 +11,6 @@
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
 # STATIC - if defined means link exe with static libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode exe
 #
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index a2df5312abc..a16909869bc 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -10,7 +10,6 @@
 # CPPDIR - list	of directories containing source files
 # OBJFILES - list of (non-system) object files
 # LIBFILES - list of (non-system) libraries
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG	- if defined means building with debug information
 # UNICODE - if defined when building a unicode lib
 #
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index 26d2c914198..c37d0e2c976 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -6,7 +6,6 @@
 # Inputs:
 # ~~~~~~~
 # STATIC - if defined means creating a static library or executable
-# PASCAL - if defined means link dll against pascal run-time library
 # DEBUG - if defined means building with debug information
 # UNICODE - if defined means building unicode
 # CBX - if defined means building with the new cbuilderx compiler
@@ -126,19 +125,11 @@ COMMON_LFLAGS = $(DEBUG_LFLAGS) $(STATIC_LFLAGS) -x -w-dup -Gn
 
 DLL_CFLAGS = -tWD
 DLL_LFLAGS = -Tpd -Gi
-!ifdef PASCAL
-!ifdef UNICODE
-DLL_STARTUP_OBJ = c0d32w.$(OBJ_EXT) sysinit.obj
-!else
-DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT) sysinit.obj
-!endif
-!else
 !ifdef UNICODE
 DLL_STARTUP_OBJ = c0d32w.$(OBJ_EXT)
 !else
 DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT)
 !endif
-!endif
 
 #
 # EXE specific flags
@@ -146,19 +137,11 @@ DLL_STARTUP_OBJ = c0d32.$(OBJ_EXT)
 
 EXE_CFLAGS =
 EXE_LFLAGS = -Tpe
-!ifdef PASCAL
-!ifdef UNICODE
-EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT) sysinit.obj
-!else
-EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT) sysinit.obj
-!endif
-!else
 !ifdef UNICODE
 EXE_STARTUP_OBJ = c0x32w.$(OBJ_EXT)
 !else
 EXE_STARTUP_OBJ = c0x32.$(OBJ_EXT)
 !endif
-!endif
 
 #
 # Static lib specific flags
@@ -199,15 +182,7 @@ CODEGUARD_LIB = cg32.lib
 !endif
 
 !ifdef STATIC
-!ifdef PASCAL
-COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) vcl$(VCLVER).lib vcle$(VCLVER).lib cp32mt.lib ws2_32.lib
-!else
 COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mt.lib ws2_32.lib
-!endif
-!else
-!ifdef PASCAL
-COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) vcl$(VCLVER).bpi vcle$(VCLVER).lib cp32mti.lib ws2_32.lib
 !else
 COMMON_LIBS = $(CODEGUARD_LIB) import32.$(LIB_EXT) cw32mti.lib ws2_32.lib
 !endif
-!endif
diff --git a/include/makeinclude/decorator.bor b/include/makeinclude/decorator.bor
index 074daa78c17..0b68acc3514 100644
--- a/include/makeinclude/decorator.bor
+++ b/include/makeinclude/decorator.bor
@@ -7,7 +7,6 @@
 # ~~~~~~~
 # DEBUG - defined if building a debug library/executable
 # STATIC - defined if building a static library
-# PASCAL - defined if linking against cp32*
 # UNICODE - defined if building a unicode version
 #
 # Outputs:
@@ -26,11 +25,6 @@ BORLAND_DECO=b
 DECO_PREFIX=_
 !endif
 
-!ifdef PASCAL
-DECO_PREFIX=_
-PASCAL_DECO=p
-!endif
-
 !ifdef STATIC
 DECO_PREFIX=_
 STATIC_DECO=s
@@ -46,11 +40,11 @@ DECO_PREFIX=_
 UNICODE_DECO=u
 !endif
 
-LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
+LIB_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 
 !ifdef NO_EXE_DECORATION
 EXE_DECORATOR=
 !else
-EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(PASCAL_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
+EXE_DECORATOR=$(DECO_PREFIX)$(BORLAND_DECO)$(STATIC_DECO)$(UNICODE_DECO)$(DEBUG_DECO)
 !endif
 
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
index c3beb76356f..87a35ae6725 100644
--- a/include/makeinclude/make_flags.bor
+++ b/include/makeinclude/make_flags.bor
@@ -12,30 +12,6 @@ DEBUG_FLAG = -DDEBUG
 STATIC_FLAG = -DSTATIC
 !endif
 
-!ifdef PASCAL
-PASCAL_FLAG = -DPASCAL
-!if $(BCBVER) != 4
-!ifndef FORCE_PASCAL
-!message
-!message -------------------------------------------------------------
-!message The PASCAL build configuration is *not* required for use with
-!message Borland C++Builder 5 or 6.
-!message
-!message Since both VCL and non-VCL applications share a common run-
-!message time library (i.e. cc3250mt.dll), you can simply link your
-!message VCL code with a non-PASCAL build of the ACE+TAO libraries.
-!message
-!message If you still really want to build a PASCAL configuration, add
-!message -DFORCE_PASCAL to your make command.
-!message -------------------------------------------------------------
-!message
-!error Aborting build
-!else
-PASCAL_FLAG = -DPASCAL -DFORCE_PASCAL
-!endif
-!endif
-!endif
-
 !ifdef CODEGUARD
 CODEGUARD_FLAG = -DCODEGUARD
 !endif
@@ -52,5 +28,5 @@ UNICODE_FLAG = -DUNICODE
 NO_FULL_PATH_FLAG = -DNO_FULL_PATH
 !endif
 
-MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(UNICODE_FLAG) \
+MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(UNICODE_FLAG) \
        $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG) $(NO_FULL_PATH_FLAG)
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index 586b38e6f27..a8687bd5fb5 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -42,18 +42,6 @@ DEBUG_DIR=Release
 OBJDEBUG_DIR=Release
 !endif
 
-!ifdef PASCAL
-!ifndef PASCAL_DIR
-PASCAL_DIR=Pascal
-!endif
-OBJPASCAL_DIR=Pascal
-!else
-!ifndef PASCAL_DIR
-PASCAL_DIR=.
-!endif
-OBJPASCAL_DIR=.
-!endif
-
 !ifdef UNICODE
 !ifndef UNICODE_DIR
 UNICODE_DIR=Unicode
@@ -76,14 +64,14 @@ BASE_BINDIR=.
 BASE_OBJDIR=.\obj
 !endif
 
-CONFIG_SUBDIR=$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
+CONFIG_SUBDIR=$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
 
 !ifndef BINDIR
-BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
+BINDIR=$(BASE_BINDIR)\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
 !endif
 
 !ifndef CORE_BINDIR
-CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)\$(UNICODE_DIR)
+CORE_BINDIR=$(ACE_ROOT)\bin\$(STATIC_DIR)\$(DEBUG_DIR)\$(UNICODE_DIR)
 !endif
 
 !ifdef MKDIR
@@ -94,7 +82,7 @@ MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
 !endif
 
 !ifndef OBJDIR
-OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJPASCAL_DIR)\$(OBJUNICODE_DIR)
+OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(OBJSTATIC_DIR)\$(OBJDEBUG_DIR)\$(OBJUNICODE_DIR)
 !endif
 
 !ifdef MKDIR