summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-02-22 12:59:30 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-02-22 12:59:30 +0000
commit50a5c517acdb0fba8221a0d273d1206bbfcb8f64 (patch)
tree7c45220050ba5f324afc4ab64feaaec00b93c482
parent6c081572de2c0f8cfc60ae2ecf0dd521d4afd69c (diff)
downloadATCD-50a5c517acdb0fba8221a0d273d1206bbfcb8f64.tar.gz
Thu Feb 22 12:58:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/include/makeinclude/compiler.bor14
1 files changed, 2 insertions, 12 deletions
diff --git a/ACE/include/makeinclude/compiler.bor b/ACE/include/makeinclude/compiler.bor
index 380ef48e934..f72603101fe 100644
--- a/ACE/include/makeinclude/compiler.bor
+++ b/ACE/include/makeinclude/compiler.bor
@@ -32,24 +32,14 @@
# LIB_EXT - the extension to be used for libs
#
-# Get the BCBVER and VCLVER, if it is not set, we default to BCB6.
+# Check for BCBVER
!if $(BCBVER) == 8
-VCLVER =
!else
!if $(BCBVER) == 6
-VCLVER =
-!else
-!if $(BCBVER) == 5
-VCLVER = 50
-!else
-!if $(BCBVER) == 4
-VCLVER = 40
!else
!error BCBVER must be explicitly set as environment variable or is set to a not supported value.
!endif
!endif
-!endif
-!endif
OBJ_EXT = obj
LIB_EXT = lib
@@ -79,7 +69,7 @@ CPU_CFLAG =
DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1
DEBUG_LFLAGS = -v -L$(BCB)\lib\debug
!else
-!if $(BCBVER) == 6 || $(BCBVER) == 5
+!if $(BCBVER) == 6
DEBUG_CFLAGS = -OS -Ov -Og -DNDEBUG
!else
DEBUG_CFLAGS = -O2 -DNDEBUG