diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-19 17:34:42 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:42:29 +0000 |
commit | 2eaf0cf8fd6e7c290497fedb08134a89e7b49b1d (patch) | |
tree | 0a4f7bf528e87d0b0a71ce7fccf702b87f4cdec1 /src/3rdparty/freetype/builds/dos | |
parent | 77c518a50334d4dcf2476a4f39edc1e3990c7f0b (diff) |
Update bundled FreeType to 2.5.5
Removed everything, imported with help of import_from_tarball.sh script,
and then added a pre-generated builds/unix/ftconfig.h
Task-number: QTBUG-44648
Change-Id: Iea948e41f7761f1580382b3763d04c7a61383382
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/dos')
-rw-r--r-- | src/3rdparty/freetype/builds/dos/detect.mk | 142 | ||||
-rw-r--r-- | src/3rdparty/freetype/builds/dos/dos-def.mk | 45 | ||||
-rw-r--r-- | src/3rdparty/freetype/builds/dos/dos-emx.mk | 21 | ||||
-rw-r--r-- | src/3rdparty/freetype/builds/dos/dos-gcc.mk | 21 | ||||
-rw-r--r-- | src/3rdparty/freetype/builds/dos/dos-wat.mk | 20 |
5 files changed, 0 insertions, 249 deletions
diff --git a/src/3rdparty/freetype/builds/dos/detect.mk b/src/3rdparty/freetype/builds/dos/detect.mk deleted file mode 100644 index 700a122688..0000000000 --- a/src/3rdparty/freetype/builds/dos/detect.mk +++ /dev/null @@ -1,142 +0,0 @@ -# -# FreeType 2 configuration file to detect a DOS host platform. -# - - -# Copyright 1996-2000, 2003, 2004, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -.PHONY: setup - - -ifeq ($(PLATFORM),ansi) - - # Test for DJGPP by checking the DJGPP environment variable, which must be - # set in order to use the system (ie. it will always be present when the - # `make' utility is run). - # - # We test for the COMSPEC environment variable, then run the `ver' - # command-line program to see if its output contains the word `Dos' or - # `DOS'. - # - # If this is true, we are running a Dos-ish platform (or an emulation). - # - ifdef DJGPP - PLATFORM := dos - else - ifdef COMSPEC - is_dos := $(findstring DOS,$(subst Dos,DOS,$(shell ver))) - - # We try to recognize a Dos session under OS/2. The `ver' command - # returns `Operating System/2 ...' there, so `is_dos' should be empty. - # - # To recognize a Dos session under OS/2, we check COMSPEC for the - # substring `MDOS\COMMAND' - # - ifeq ($(is_dos),) - is_dos := $(findstring MDOS\COMMAND,$(COMSPEC)) - endif - - # We also try to recognize Dos 7.x without Windows 9X launched. - # 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. - ifndef windir - is_dos := $(findstring Windows,$(strip $(shell ver))) - endif -#endif - endif - endif - - endif # test COMSPEC - - ifneq ($(is_dos),) - - PLATFORM := dos - - endif # test Dos - endif # test DJGPP -endif # test PLATFORM ansi - -ifeq ($(PLATFORM),dos) - - # Use DJGPP (i.e. gcc) by default. - # - CONFIG_FILE := dos-gcc.mk - CC ?= gcc - - # additionally, we provide hooks for various other compilers - # - ifneq ($(findstring emx,$(MAKECMDGOALS)),) # EMX gcc - CONFIG_FILE := dos-emx.mk - CC := gcc - emx: setup - .PHONY: emx - endif - - ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C - CONFIG_FILE := dos-tcc.mk - CC := tcc - turboc: setup - .PHONY: turboc - endif - - ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ - CONFIG_FILE := dos-wat.mk - CC := wcc386 - watcom: setup - .PHONY: watcom - endif - - ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit - CONFIG_FILE := dos-bcc.mk - CC := bcc32 - borlandc: setup - .PHONY: borlandc - endif - - ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit - CONFIG_FILE := dos-bcc.mk - CC := bcc - borlandc16: setup - .PHONY: borlandc16 - endif - - ifneq ($(findstring bash,$(SHELL)),) # check for bash - SEP := / - DELETE := rm - COPY := cp - CAT := cat - setup: std_setup - else - SEP := $(BACKSLASH) - DELETE := del - CAT := type - - # 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) - COPY := cmd.exe /c copy - else - COPY := copy - endif # test NT - - setup: dos_setup - endif - -endif # test PLATFORM dos - - -# EOF diff --git a/src/3rdparty/freetype/builds/dos/dos-def.mk b/src/3rdparty/freetype/builds/dos/dos-def.mk deleted file mode 100644 index 950f581a00..0000000000 --- a/src/3rdparty/freetype/builds/dos/dos-def.mk +++ /dev/null @@ -1,45 +0,0 @@ -# -# FreeType 2 DOS specific definitions -# - - -# Copyright 1996-2000, 2003, 2005, 2006 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -DELETE := del -CAT := type -SEP := $(strip \ ) -BUILD_DIR := $(TOP_DIR)/builds/dos -PLATFORM := dos - - -# The executable file extension (for tools), *with* leading dot. -# -E := .exe - -# The directory where all library files are placed. -# -# By default, this is the same as $(OBJ_DIR); however, this can be changed -# to suit particular needs. -# -LIB_DIR := $(OBJ_DIR) - -# The name of the final library file. Note that the DOS-specific Makefile -# uses a shorter (8.3) name. -# -LIBRARY := $(PROJECT) - - -# The NO_OUTPUT macro is used to ignore the output of commands. -# -NO_OUTPUT = > nul - - -# EOF diff --git a/src/3rdparty/freetype/builds/dos/dos-emx.mk b/src/3rdparty/freetype/builds/dos/dos-emx.mk deleted file mode 100644 index 6ea8f6d872..0000000000 --- a/src/3rdparty/freetype/builds/dos/dos-emx.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# FreeType 2 configuration rules for the EMX gcc compiler -# - - -# Copyright 2003 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -include $(TOP_DIR)/builds/dos/dos-def.mk -include $(TOP_DIR)/builds/compiler/emx.mk -include $(TOP_DIR)/builds/link_dos.mk - - -# EOF diff --git a/src/3rdparty/freetype/builds/dos/dos-gcc.mk b/src/3rdparty/freetype/builds/dos/dos-gcc.mk deleted file mode 100644 index e14255c1f2..0000000000 --- a/src/3rdparty/freetype/builds/dos/dos-gcc.mk +++ /dev/null @@ -1,21 +0,0 @@ -# -# FreeType 2 configuration rules for the DJGPP compiler -# - - -# Copyright 1996-2000, 2003 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - - -include $(TOP_DIR)/builds/dos/dos-def.mk -include $(TOP_DIR)/builds/compiler/gcc.mk -include $(TOP_DIR)/builds/link_dos.mk - - -# EOF diff --git a/src/3rdparty/freetype/builds/dos/dos-wat.mk b/src/3rdparty/freetype/builds/dos/dos-wat.mk deleted file mode 100644 index c763b163cd..0000000000 --- a/src/3rdparty/freetype/builds/dos/dos-wat.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# FreeType 2 configuration rules for the Watcom C/C++ compiler -# - - -# Copyright 2003 by -# David Turner, Robert Wilhelm, and Werner Lemberg. -# -# This file is part of the FreeType project, and may only be used, modified, -# and distributed under the terms of the FreeType project license, -# LICENSE.TXT. By continuing to use, modify, or distribute this file you -# indicate that you have read the license and understand and accept it -# fully. - -include $(TOP_DIR)/builds/dos/dos-def.mk -include $(TOP_DIR)/builds/compiler/watcom.mk -include $(TOP_DIR)/builds/link_dos.mk - - -# EOF |