summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLogs/ChangeLog-02a10
-rw-r--r--ChangeLogs/ChangeLog-03a10
-rw-r--r--ace/config-win32-borland.h7
-rw-r--r--include/makeinclude/outputdir.bor2
5 files changed, 37 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ed4b17ebb1..426eef5d5cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/outputdir.bor:
+ Removed the now out-of-date comment about pascal/non-pascal
+ build directories.
+
+ * ace/config-win32-borland.h:
+ Added support for new ACE_HAS_VCL define to enable inclusion
+ of VCL header files.
+
Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu>
* ace/Makefile.am:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 9ed4b17ebb1..426eef5d5cf 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/outputdir.bor:
+ Removed the now out-of-date comment about pascal/non-pascal
+ build directories.
+
+ * ace/config-win32-borland.h:
+ Added support for new ACE_HAS_VCL define to enable inclusion
+ of VCL header files.
+
Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu>
* ace/Makefile.am:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9ed4b17ebb1..426eef5d5cf 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Sat Feb 10 07:19:37 2001 Christopher Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/outputdir.bor:
+ Removed the now out-of-date comment about pascal/non-pascal
+ build directories.
+
+ * ace/config-win32-borland.h:
+ Added support for new ACE_HAS_VCL define to enable inclusion
+ of VCL header files.
+
Fri Feb 9 16:47:44 2001 Pradeep Gore <pradeep@cs.wustl.edu>
* ace/Makefile.am:
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index d2b04bd2712..6f0b49a31ab 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -25,6 +25,13 @@
# define WIN32 1
# endif
+// When building a VCL application, the main VCL header file should be
+// included before anything else. You can define ACE_HAS_VCL=1 in your
+// project settings to have this file included for you automatically.
+# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0)
+# include <vcl.h>
+# endif
+
# include "ace/config-win32-common.h"
# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder")
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index d56853f8027..026dada72d0 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -58,8 +58,6 @@ MAKE_BINDIR=$(MKDIR) "$(BINDIR)"
MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
!endif
-# PASCAL/non-PASCAL build configurations use the same object directory
-# since their compiler options are identical.
!ifndef OBJDIR
OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
!endif