diff --git a/ChangeLog b/ChangeLog index 5cb9741a6..0bfe4fa7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-25 Antoine Leca + + * 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 * src/pfc/pcfread.c (pcf_load_font): Handle property `POINT_SIZE' diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index a325b9925..046784887 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