Commit a347bda1 authored by Werner Lemberg's avatar Werner Lemberg

Documentation update for repository move to 'freedesktop.org'.

parent 8c68be6e
......@@ -24,7 +24,7 @@ space := $(empty) $(empty)
# versions of the FreeType configuration header files `ft2build.h'
# and `ftoption.h' given in this directory).
#
TOP_DIR ?= ../freetype2
TOP_DIR ?= ../freetype
TOP_DIR_2 ?= .
OBJ_DIR ?= $(TOP_DIR)/objs
......@@ -575,7 +575,7 @@ endif
# we check for `dist', not `distclean'
ifneq ($(findstring distx,$(MAKECMDGOALS)x),)
FT_H := ../freetype2/include/freetype/freetype.h
FT_H := ../freetype/include/freetype/freetype.h
major := $(shell sed -n 's/.*FREETYPE_MAJOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
minor := $(shell sed -n 's/.*FREETYPE_MINOR[^0-9]*\([0-9]\+\)/\1/p' < $(FT_H))
......
......@@ -4,23 +4,23 @@ This package contains example programs for the FreeType 2 library.
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
The Makefile contained in this directory assume that the FreeType 2
library sources are located in `../freetype2'. If you downloaded
one of the stable FreeType 2 source packages from our server, you
most probably have to rename its directory, for example:
library sources are located in `../freetype`. If you downloaded one
of the stable FreeType 2 source packages from our server, you most
probably have to rename its directory, for example:
mv freetype-2.10.4 freetype2 on Unix
rename freetype-2.10.4 freetype2 on Windows
mv freetype-2.10.4 freetype on Unix
rename freetype-2.10.4 freetype on Windows
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
First compile the FreeType 2 library, then say `make'. However, you
must rename the directory of the FreeType 2 library to `freetype2'
First compile the FreeType 2 library, then say `make`. However, you
must rename the directory of the FreeType 2 library to `freetype`
(or create a symlink) before doing this.
Note that the demonstration programs include a tiny graphics
sub-system that includes `drivers' to display Windows on Win32, X11,
BeOS, Mac, and OS/2. The build system should automatically detect
sub-system that includes 'drivers' to display Windows on Win32, X11,
BeOS, Mac, and OS/2. The build system should automatically detect
which driver to use based on the current platform.
UNIX USERS
......@@ -30,27 +30,27 @@ WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
----------
When building the demos, the build system tries to detect your X11
path by looking for the patterns `X11/bin', `X11R6/bin', and
`X11R5/bin' in your current path (in this order). If no X11 path
is found, some demo programs will not be able to display graphics
path by looking for the patterns `X11/bin`, `X11R6/bin`, and
`X11R5/bin` in your current path (in this order). If no X11 path
is found, some demo programs will not be able to display graphics
and will fail. If you have X11 in an unusual place, use the
X11_PATH make variable. More than one directory, if necessary,
`X11_PATH` make variable. More than one directory, if necessary,
must be separated with spaces. Example:
make X11_PATH="/usr/openwin /usr/local/X11R6"
The build system then derives the X11_INCLUDE include file path
from X11_PATH by appending `/include' to all path components. It
also derives the X11_LIB library path from X11_PATH by appending
`/lib64' and `/lib' to all components (in that order). You might
override those variables similar to X11_PATH as arguments to
`make'.
The build system then derives the `X11_INCLUDE` include file path
from `X11_PATH` by appending `/include` to all path components.
It also derives the `X11_LIB` library path from `X11_PATH` by
appending `/lib64` and `/lib` to all components (in that order).
You might override those variables similar to `X11_PATH` as
arguments to `make`.
If you don't have X11 at all, fix the definition of the EXES
If you don't have X11 at all, fix the definition of the `EXES`
variable as described in the top-level Makefile.
Recent versions of Mac OS X no longer deliver X11 by default; you
have to install XQuartz, see
Recent versions of Mac OS X no longer deliver X11 by default; you
have to install 'XQuartz', see
https://support.apple.com/en-us/HT201341
......@@ -60,15 +60,15 @@ WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
Using a different build directory
---------------------------------
If the `configure' script of the FreeType 2 library is run from a
separate build directory, it creates a dummy Makefile which sets
some variables before including the top-level Makefile of the
source directory. This dummy Makefile can also be used for the
ft2demos package to be compiled in a different build directory:
If the `configure` script of the FreeType 2 library is run from a
separate build directory, it creates a dummy `Makefile` file that
sets some variables before including the top-level Makefile of the
source directory. This dummy Makefile can also be used for the
'ft2demos' package to be compiled in a different build directory:
make FT2DEMOS=1 -f /path/to/freetype2/build-dir/Makefile
make FT2DEMOS=1 -f /path/to/freetype/build-dir/Makefile
If necessary, adapt the `TOP_DIR_2' variable to make it point to
the ft2demos source directory.
If necessary, adapt the `TOP_DIR_2` variable to make it point to
the 'ft2demos' source directory.
--- end of README ---
......@@ -13,7 +13,7 @@ all: exes
empty :=
space := $(empty) $(empty)
TOP_DIR ?= ../../freetype2
TOP_DIR ?= ../../freetype
OBJ_DIR ?= $(TOP_DIR)/objs
TOP_DIR_2 ?= ..
OBJ_DIR_2 ?= $(TOP_DIR_2)/objs
......
......@@ -6,7 +6,7 @@
MAKEFILE = ftoldmac.m68k_far.make
\xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when makefile is modified
FT2Dir = ::freetype2:
FT2Dir = ::freetype:
ObjDir = :objs:
Includes = \xB6
-i "{FT2Dir}include:" \xB6
......
......@@ -6,7 +6,7 @@
MAKEFILE = ftoldmac.ppc_classic.make
\xA5MondoBuild\xA5 = {MAKEFILE} # Make blank to avoid rebuilds when makefile is modified
FT2Dir = ::freetype2:
FT2Dir = ::freetype:
ObjDir = :objs:
Includes = \xB6
-i "{FT2Dir}include:" \xB6
......
# ftinspect.pro
QMAKE_CXXFLAGS += -isystem ../../../freetype2/include
QMAKE_CXXFLAGS += -isystem ../../../freetype/include
# To avoid conflicts with the FreeType version compiled into or used by Qt,
# we use the static library.
#
# You should adapt this to your setup.
unix|macx {
LIBS += ../../../freetype2/objs/.libs/libfreetype.a
LIBS += ../../../freetype/objs/.libs/libfreetype.a
CONFIG += link_pkgconfig
PKGCONFIG += libpng harfbuzz zlib bzip2 libbrotlidec
......
......@@ -75,9 +75,9 @@ MainGUI::about()
" all rendering parameters.</p>"
""
"<p>License:"
" <a href='http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT'>FreeType"
" <a href='https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/FTL.TXT'>FreeType"
" License (FTL)</a> or"
" <a href='http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/GPLv2.TXT'>GNU"
" <a href='https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/GPLv2.TXT'>GNU"
" GPLv2</a></p>")
.arg(QApplication::applicationVersion())
.arg(QChar(0xA9)));
......
......@@ -61,7 +61,7 @@
#include FT_DRIVER_H
/* The following header shouldn't be used in normal programs. */
/* `freetype2/src/truetype' must be in the current include path. */
/* `freetype/src/truetype' must be in the current include path. */
#include "ttobjs.h"
#include "ttdriver.h"
#include "ttinterp.h"
......
......@@ -36,9 +36,9 @@ $!
$ open/write optf 'optfile'
$ If f$getsyi("HW_MODEL") .gt. 1024
$ Then
$ write optf "[-.freetype2.lib]freetype2shr.exe/share"
$ write optf "[-.freetype.lib]freetype2shr.exe/share"
$ else
$ write optf "[-.freetype2.lib]freetype.olb/lib"
$ write optf "[-.freetype.lib]freetype.olb/lib"
$ endif
$ gosub check_create_vmslib
$ write optf "sys$share:decw$xlibshr.exe/share"
......@@ -51,7 +51,7 @@ $!
$ exit
$!
$ERR_LIB:
$ write sys$output "Error reading config file [-.freetype2]vmslib.dat"
$ write sys$output "Error reading config file [-.freetype]vmslib.dat"
$ goto err_exit
$FT2_ERR:
$ write sys$output "Could not locate FreeType 2 include files"
......@@ -86,7 +86,7 @@ $ deck
.FIRST
define freetype [-.freetype2.include.freetype]
define freetype [-.freetype.include.freetype]
CC = cc
......@@ -97,7 +97,7 @@ GRX11SRC = [.graph.x11]
OBJDIR = [.objs]
# include paths
INCLUDES = /include=([-.freetype2.include],[.graph])
INCLUDES = /include=([-.freetype.include],[.graph])
GRAPHOBJ = $(OBJDIR)grblit.obj, \
$(OBJDIR)grobjs.obj, \
......@@ -214,9 +214,9 @@ $! ---> Attention slightly changed version to take into account special
$! situation for FreeType 2 demos
$CHECK_CREATE_VMSLIB:
$!
$ if f$search("[-.freetype2]VMSLIB.DAT") .eqs. ""
$ if f$search("[-.freetype]VMSLIB.DAT") .eqs. ""
$ then
$ write sys$output "FreeType 2 driver file [-.freetype2]vmslib.dat not found."
$ write sys$output "FreeType 2 driver file [-.freetype]vmslib.dat not found."
$ write sys$output "Either Ft2demos have been installed in the wrong location"
$ write sys$output "or FreeType 2 has not yet been configured."
$ write sys$output "Exiting..."
......@@ -230,7 +230,7 @@ $ libincs = ""
$!
$! Open data file with location of libraries
$!
$ open/read/end=end_lib/err=err_lib libdata [-.freetype2]VMSLIB.DAT
$ open/read/end=end_lib/err=err_lib libdata [-.freetype]VMSLIB.DAT
$LIB_LOOP:
$ read/end=end_lib libdata libline
$ libline = f$edit(libline, "UNCOMMENT,COLLAPSE")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment