* builds/dos/detect.mk: Correcting the order for Borland compilers:

16-bit bcc was never selected, always overriden by 32-bit bcc32.
BRANCH-2-1-5
Antoine Leca 23 years ago
parent 39defae424
commit 21bdad1554
  1. 5
      ChangeLog
  2. 16
      builds/dos/detect.mk

@ -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'

@ -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

Loading…
Cancel
Save