diff options
| author | Antoine Leca <antoine-freetype@leca-marti.org> | 2001-12-25 20:54:33 +0000 |
|---|---|---|
| committer | Antoine Leca <antoine-freetype@leca-marti.org> | 2001-12-25 20:54:33 +0000 |
| commit | 21bdad15545a7c8155eb3ab07798ded3f7cb3b39 (patch) | |
| tree | 43a6de07f55133a854073e72f8493311d5561671 | |
| parent | 39defae4241f97964eeee32ee804a5180e6cb4bb (diff) | |
| download | freetype2-21bdad15545a7c8155eb3ab07798ded3f7cb3b39.tar.gz | |
* builds/dos/detect.mk: Correcting the order for Borland compilers:
16-bit bcc was never selected, always overriden by 32-bit bcc32.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | builds/dos/detect.mk | 16 |
2 files changed, 13 insertions, 8 deletions
@@ -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 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 |