Fix Windows build directories.
The build target is now `windows' instead of `win32'. Problem reported by Nickolas George <darknova.clan@gmail.com>. * builds/modules.mk: Don't use `win32' and `win16' (!) but `windows'. * builds/windows/detect.mk, builds/windows/win32-def.mk: s/win32/windows/.
This commit is contained in:
parent
a8ceae4008
commit
ab98c5e73b
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2014-02-08 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Fix Windows build directories.
|
||||||
|
|
||||||
|
The build target is now `windows' instead of `win32'.
|
||||||
|
|
||||||
|
Problem reported by Nickolas George <darknova.clan@gmail.com>.
|
||||||
|
|
||||||
|
* 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 <esawin@mozilla.com>
|
2014-02-08 Eugen Sawin <esawin@mozilla.com>
|
||||||
|
|
||||||
Fix Savannah bug #41507.
|
Fix Savannah bug #41507.
|
||||||
|
|
|
@ -50,7 +50,7 @@ ifeq ($(PLATFORM),ansi)
|
||||||
ifeq ($(is_dos),)
|
ifeq ($(is_dos),)
|
||||||
ifdef winbootdir
|
ifdef winbootdir
|
||||||
#ifneq ($(OS),Windows_NT)
|
#ifneq ($(OS),Windows_NT)
|
||||||
# If win32 is available, do not trigger this test.
|
# If windows is available, do not trigger this test.
|
||||||
ifndef windir
|
ifndef windir
|
||||||
is_dos := $(findstring Windows,$(strip $(shell ver)))
|
is_dos := $(findstring Windows,$(strip $(shell ver)))
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -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.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# 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_CREATE)
|
||||||
$(FTMODULE_H_DONE)
|
$(FTMODULE_H_DONE)
|
||||||
|
|
||||||
ifneq ($(findstring $(PLATFORM),dos win32 win16 os2),)
|
ifneq ($(findstring $(PLATFORM),dos windows os2),)
|
||||||
OPEN_MODULE := @echo$(space)
|
OPEN_MODULE := @echo$(space)
|
||||||
CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H))
|
CLOSE_MODULE := >> $(subst /,$(SEP),$(FTMODULE_H))
|
||||||
REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H))
|
REMOVE_MODULE := @-$(DELETE) $(subst /,$(SEP),$(FTMODULE_H))
|
||||||
|
|
|
@ -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.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# 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
|
include $(TOP_DIR)/builds/detect.mk
|
||||||
|
|
||||||
# This rule makes sense for Unix only to remove files created by a run
|
# This rule makes sense for Unix only to remove files created by a run of
|
||||||
# of the configure script which hasn't been successful (so that no
|
# the configure script which hasn't been successful (so that no
|
||||||
# `config.mk' has been created). It uses the built-in $(RM) command of
|
# `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.
|
# been erroneously used.
|
||||||
#
|
#
|
||||||
# Note: This test is duplicated in `builds/unix/detect.mk'.
|
# Note: This test is duplicated in `builds/unix/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.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# 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)
|
ifeq ($(OS),Windows_NT)
|
||||||
|
|
||||||
PLATFORM := win32
|
PLATFORM := windows
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
|
@ -44,7 +44,8 @@ ifeq ($(PLATFORM),ansi)
|
||||||
#
|
#
|
||||||
# A better test is to check whether there are both the environment
|
# A better test is to check whether there are both the environment
|
||||||
# variables `winbootdir' and `windir'. The first indicates an
|
# 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
|
# 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
|
# from DOS-based tools like DJGPP's make; this is not actually a problem
|
||||||
|
@ -53,7 +54,7 @@ ifeq ($(PLATFORM),ansi)
|
||||||
ifdef winbootdir
|
ifdef winbootdir
|
||||||
ifdef windir
|
ifdef windir
|
||||||
|
|
||||||
PLATFORM := win32
|
PLATFORM := windows
|
||||||
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -62,7 +63,7 @@ ifeq ($(PLATFORM),ansi)
|
||||||
|
|
||||||
endif # test PLATFORM ansi
|
endif # test PLATFORM ansi
|
||||||
|
|
||||||
ifeq ($(PLATFORM),win32)
|
ifeq ($(PLATFORM),windows)
|
||||||
|
|
||||||
DELETE := del
|
DELETE := del
|
||||||
CAT := type
|
CAT := type
|
||||||
|
@ -177,7 +178,7 @@ ifeq ($(PLATFORM),win32)
|
||||||
.PHONY: devel-gcc
|
.PHONY: devel-gcc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif # test PLATFORM win32
|
endif # test PLATFORM windows
|
||||||
|
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
|
@ -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.
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
#
|
#
|
||||||
# This file is part of the FreeType project, and may only be used, modified,
|
# This file is part of the FreeType project, and may only be used, modified,
|
||||||
|
@ -17,7 +17,7 @@ DELETE := del
|
||||||
CAT := type
|
CAT := type
|
||||||
SEP := $(strip \ )
|
SEP := $(strip \ )
|
||||||
BUILD_DIR := $(TOP_DIR)/builds/windows
|
BUILD_DIR := $(TOP_DIR)/builds/windows
|
||||||
PLATFORM := win32
|
PLATFORM := windows
|
||||||
|
|
||||||
# The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
|
# The executable file extension (for tools). NOTE: WE INCLUDE THE DOT HERE !!
|
||||||
#
|
#
|
||||||
|
|
|
@ -52,7 +52,7 @@ instructions in the file `INSTALL.UNIX' instead.
|
||||||
|
|
||||||
The following settings are used:
|
The following settings are used:
|
||||||
|
|
||||||
platform win32
|
platform windows
|
||||||
compiler gcc
|
compiler gcc
|
||||||
configuration directory .\builds\windows
|
configuration directory .\builds\windows
|
||||||
configuration rules .\builds\windows\w32-gcc.mk
|
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.
|
David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||||
|
|
||||||
This file is part of the FreeType project, and may only be used,
|
This file is part of the FreeType project, and may only be used,
|
||||||
|
|
|
@ -12,3 +12,4 @@ libfreetype.la
|
||||||
debug*/
|
debug*/
|
||||||
release*/
|
release*/
|
||||||
win32/
|
win32/
|
||||||
|
win64/
|
||||||
|
|
Loading…
Reference in New Issue