From 7c1fe2ae64c63b2caccb4e691b4ebb1777877b15 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 23 Nov 2004 21:38:16 +0000 Subject: [PATCH] Minor fixes. --- ChangeLog | 13 +++++----- builds/dos/detect.mk | 11 ++++---- builds/win32/detect.mk | 58 +++++++++++++++++++++--------------------- 3 files changed, 42 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9028aecab..78bc6d6b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ -2004-11-20 Antoine Leca +2004-11-22 Antoine Leca - * builds/win32/detect.mk: Corrected logic that detects - Windows NT to use the previous change even when win32 is - forced. Corrected detection of win32 on Win9X. - * builds/dos/detect.mk: Added same correction as for win32 - about COPY on Windows NT. Detection of plain DOS 7.x. + * builds/win32/detect.mk: Corrected logic that detects Windows NT to + use the previous change even if win32 is forced. Corrected + detection of win32 on Win9X. + + * builds/dos/detect.mk: Added same correction as for win32 about + COPY on Windows NT. Detection of plain DOS 7.x. 2004-11-22 Werner Lemberg diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 451eeb55b..43c48d0f3 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003 by +# Copyright 1996-2000, 2003, 2004 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -45,11 +45,12 @@ ifeq ($(PLATFORM),ansi) endif # We also try to recognize Dos 7.x without Windows 9X launched. - # See builds\win32\detect.mk for explanations about the logic. + # See builds/win32/detect.mk for explanations about the logic. + # ifeq ($(is_dos),) ifdef winbootdir #ifneq ($(OS),Windows_NT) - # If Win32 is available, do not trigger this test + # If win32 is available, do not trigger this test. ifndef windir is_dos := $(findstring Windows,$(strip $(shell ver))) endif @@ -122,8 +123,8 @@ ifeq ($(PLATFORM),dos) SEP := $(BACKSLASH) DELETE := del - # Setting COPY is a bit trickier. We can be running DJGPP on some - # Windows NT derivatives, like XP. See builds\win32\detect.mk for + # Setting COPY is a bit trickier. We can be running DJGPP on some + # Windows NT derivatives, like XP. See builds/win32/detect.mk for # explanations why we need hacking here. # ifeq ($(OS),Windows_NT) diff --git a/builds/win32/detect.mk b/builds/win32/detect.mk index a7de659c2..97e7b5227 100644 --- a/builds/win32/detect.mk +++ b/builds/win32/detect.mk @@ -19,7 +19,7 @@ ifeq ($(PLATFORM),ansi) # Detecting Windows NT is easy, as the OS variable must be defined and - # contains `Windows_NT'. This also works with Windows 2000, XP. + # contains `Windows_NT'. This also works with Windows 2000 and XP. # ifeq ($(OS),Windows_NT) @@ -27,29 +27,29 @@ ifeq ($(PLATFORM),ansi) else - # Detecting Windows 9X + # Detecting Windows 9X # We used to run the `ver' command to see if its output contains the - # word `Windows'. If this is true, we are running Windows 95 or later. - - ###ifdef COMSPEC - ### First, check if we have the COMSPEC environment variable, which - ### indicates we can use COMMAND.COM's internal commands - ### is_windows := $(findstring Windows,$(strip $(shell ver))) - ###endif - + # word `Windows'. If this is true, we are running Windows 95 or later: + # + # ifdef COMSPEC + # # First, check if we have the COMSPEC environment variable, which + # # indicates we can use COMMAND.COM's internal commands + # is_windows := $(findstring Windows,$(strip $(shell ver))) + # endif + # # Unfortunately, this also detects the case when one is running - # DOS 7.x (MS-DOS version that lies below Windows) without actually + # DOS 7.x (the MS-DOS version that lies below Windows) without actually # launching the GUI. - - # A better test is to check is there are both %winbootdir% and %windir% - # environment variables. The first indicates underlying DOS 7.x, and - # the second is set only when Win32 is available. - - # Note that on Windows NT, such environment variable will not be seen - # from DOS-based tools like DJGPP make; this is not actually a problem - # since NT is detected independantly above. But do not try to be clever! - + # + # A better test is to check whether there are both the environment + # variables `winbootdir' and `windir'. The first indicates an + # underlying DOS 7.x, while the second is set only if win32 is available. + # + # Note that on Windows NT, such an environment variable will not be seen + # from DOS-based tools like DJGPP's make; this is not actually a problem + # since NT is detected independantly above. But do not try to be clever! + # ifdef winbootdir ifdef windir @@ -67,17 +67,17 @@ ifeq ($(PLATFORM),win32) DELETE := del SEP := $(BACKSLASH) - # Setting COPY is a bit trickier. Plain COPY on NT will not work - # correctly, because it will uppercase 8.3 filenames, so we will get - # a `CONFIG.MK' file which isn't found later on by `make'. - # And we do not want that. So we need to force execution of CMD.EXE. - # Unfortunately this latter is not available on Windows 9X... + # Setting COPY is a bit trickier. Plain COPY on NT will not work + # correctly, because it will uppercase 8.3 filenames, creating a + # `CONFIG.MK' file which isn't found later on by `make'. + # Since we do not want that, we need to force execution of CMD.EXE. + # Unfortunately, CMD.EXE is not available on Windows 9X. # So we need to hack. - + # # Kudos to Eli Zaretskii (DJGPP guru) that helped debug it. - # Details available in threads in freetype mailing list (2004-11-11) - # and then devel mailing list (2004-11-20 to -23). - + # Details are available in threads of the freetype mailing list + # (2004-11-11), and then in the devel mailing list (2004-11-20 to -23). + # ifeq ($(OS),Windows_NT) COPY := cmd.exe /c copy else