From ab98c5e73b4c4a6eed88dbc6338225012cd72a3e Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 8 Feb 2014 11:34:33 +0100 Subject: [PATCH] Fix Windows build directories. The build target is now `windows' instead of `win32'. Problem reported by Nickolas George . * builds/modules.mk: Don't use `win32' and `win16' (!) but `windows'. * builds/windows/detect.mk, builds/windows/win32-def.mk: s/win32/windows/. --- ChangeLog | 14 ++++++++++++++ builds/dos/detect.mk | 2 +- builds/modules.mk | 4 ++-- builds/toplevel.mk | 8 ++++---- builds/windows/detect.mk | 13 +++++++------ builds/windows/win32-def.mk | 4 ++-- docs/INSTALL.GNU | 4 ++-- objs/.gitignore | 1 + 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f43c0450..ea0f612b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2014-02-08 Werner Lemberg + + Fix Windows build directories. + + The build target is now `windows' instead of `win32'. + + Problem reported by Nickolas George . + + * builds/modules.mk: Don't use `win32' and `win16' (!) but + `windows'. + + * builds/windows/detect.mk, builds/windows/win32-def.mk: + s/win32/windows/. + 2014-02-08 Eugen Sawin Fix Savannah bug #41507. diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 19bdeab2d..3e5e967e4 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -50,7 +50,7 @@ ifeq ($(PLATFORM),ansi) ifeq ($(is_dos),) ifdef winbootdir #ifneq ($(OS),Windows_NT) - # If win32 is available, do not trigger this test. + # If windows is available, do not trigger this test. ifndef windir is_dos := $(findstring Windows,$(strip $(shell ver))) endif diff --git a/builds/modules.mk b/builds/modules.mk index c4a882cbd..3c1b083dd 100644 --- a/builds/modules.mk +++ b/builds/modules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2006, 2008 by +# Copyright 1996-2000, 2003, 2006, 2008, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -28,7 +28,7 @@ $(FTMODULE_H): $(MODULES_CFG) $(FTMODULE_H_CREATE) $(FTMODULE_H_DONE) -ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),) +ifneq ($(findstring $(PLATFORM),dos windows os2),) OPEN_MODULE := @echo$(space) CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H)) REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H)) diff --git a/builds/toplevel.mk b/builds/toplevel.mk index 968202853..812750ac5 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012, 2013 by +# Copyright 1996-2001, 2003, 2006, 2008-2010, 2012-2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -112,10 +112,10 @@ ifdef check_platform include $(TOP_DIR)/builds/detect.mk - # This rule makes sense for Unix only to remove files created by a run - # of the configure script which hasn't been successful (so that no + # This rule makes sense for Unix only to remove files created by a run of + # the configure script which hasn't been successful (so that no # `config.mk' has been created). It uses the built-in $(RM) command of - # GNU make. Similarly, `nul' is created if e.g. `make setup win32' has + # GNU make. Similarly, `nul' is created if e.g. `make setup windows' has # been erroneously used. # # Note: This test is duplicated in `builds/unix/detect.mk'. diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk index 190653960..9dca26127 100644 --- a/builds/windows/detect.mk +++ b/builds/windows/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2004, 2006, 2007 by +# Copyright 1996-2000, 2003, 2004, 2006, 2007, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -23,7 +23,7 @@ ifeq ($(PLATFORM),ansi) # ifeq ($(OS),Windows_NT) - PLATFORM := win32 + PLATFORM := windows else @@ -44,7 +44,8 @@ ifeq ($(PLATFORM),ansi) # # 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. + # underlying DOS 7.x, while the second is set only if windows 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 @@ -53,7 +54,7 @@ ifeq ($(PLATFORM),ansi) ifdef winbootdir ifdef windir - PLATFORM := win32 + PLATFORM := windows endif endif @@ -62,7 +63,7 @@ ifeq ($(PLATFORM),ansi) endif # test PLATFORM ansi -ifeq ($(PLATFORM),win32) +ifeq ($(PLATFORM),windows) DELETE := del CAT := type @@ -177,7 +178,7 @@ ifeq ($(PLATFORM),win32) .PHONY: devel-gcc endif -endif # test PLATFORM win32 +endif # test PLATFORM windows # EOF diff --git a/builds/windows/win32-def.mk b/builds/windows/win32-def.mk index a65ea4f01..61af5df0f 100644 --- a/builds/windows/win32-def.mk +++ b/builds/windows/win32-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2003, 2005, 2006, 2013 by +# Copyright 1996-2000, 2003, 2005, 2006, 2013, 2014 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,7 +17,7 @@ DELETE := del CAT := type SEP := $(strip \ ) BUILD_DIR := $(TOP_DIR)/builds/windows -PLATFORM := win32 +PLATFORM := windows # The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !! # diff --git a/docs/INSTALL.GNU b/docs/INSTALL.GNU index c2ff299a6..3b9e0a2df 100644 --- a/docs/INSTALL.GNU +++ b/docs/INSTALL.GNU @@ -52,7 +52,7 @@ instructions in the file `INSTALL.UNIX' instead. The following settings are used: - platform win32 + platform windows compiler gcc configuration directory .\builds\windows configuration rules .\builds\windows\w32-gcc.mk @@ -148,7 +148,7 @@ instructions in the file `INSTALL.UNIX' instead. ---------------------------------------------------------------------- -Copyright 2003, 2004, 2005, 2006, 2008, 2013 by +Copyright 2003-2006, 2008, 2013, 2014 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/objs/.gitignore b/objs/.gitignore index 100d7d8fa..21b67f6ab 100644 --- a/objs/.gitignore +++ b/objs/.gitignore @@ -12,3 +12,4 @@ libfreetype.la debug*/ release*/ win32/ +win64/