ref: fb009c7449875582fb2fedecf52931a5fbabff37
parent: f891f91113f1aef8be3e0276231c134c53257554
author: Antoine Leca <[email protected]>
date: Tue Dec 25 15:54:33 EST 2001
* builds/dos/detect.mk: Correcting the order for Borland compilers: 16-bit bcc was never selected, always overriden by 32-bit bcc32.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-25 Antoine Leca <[email protected]>
+
+ * builds/dos/detect.mk: Correcting the order for Borland compilers:
+ 16-bit bcc was never selected, always overriden by 32-bit bcc32.
+
2001-12-22 Francesco Zappa Nardelli <[email protected]>
* src/pfc/pcfread.c (pcf_load_font): Handle property `POINT_SIZE'
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -80,14 +80,6 @@
.PHONY: watcom
endif
- ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
- CONFIG_FILE := dos-bcc.mk
- SEP := $(BACKSLASH)
- CC := bcc
- borlandc16: setup
- .PHONY: borlandc16
- endif
-
ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit
CONFIG_FILE := dos-bcc.mk
SEP := $(BACKSLASH)
@@ -94,6 +86,14 @@
CC := bcc32
borlandc: setup
.PHONY: borlandc
+ endif
+
+ ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
+ CONFIG_FILE := dos-bcc.mk
+ SEP := $(BACKSLASH)
+ CC := bcc
+ borlandc16: setup
+ .PHONY: borlandc16
endif
ifneq ($(findstring bash,$(SHELL)),) # check for bash