Commit fb009c7449875582fb2fedecf52931a5fbabff37
2001-12-25T20:54:33
* builds/dos/detect.mk: Correcting the order for Borland compilers: 16-bit bcc was never selected, always overriden by 32-bit bcc32.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/ChangeLog b/ChangeLog
index 5cb9741..0bfe4fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-25 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
+
+ * 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 <Francesco.Zappa.Nardelli@ens.fr>
* src/pfc/pcfread.c (pcf_load_font): Handle property `POINT_SIZE'
diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk
index a325b99..0467848 100644
--- a/builds/dos/detect.mk
+++ b/builds/dos/detect.mk
@@ -80,14 +80,6 @@ ifeq ($(PLATFORM),dos)
.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)
@@ -96,6 +88,14 @@ ifeq ($(PLATFORM),dos)
.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
DELETE := rm
COPY := cp