minor formatting issues
This commit is contained in:
Werner Lemberg
parent
f00a4de92b
commit
6fbe4db6b7
|
|
@ -76,3 +76,4 @@ LDFLAGS := @LDFLAGS@
|
|||
LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
|
||||
-rpath $(libdir) -version-info $(version_info)
|
||||
|
||||
# EOF
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# FreeType 2 Configuration rules for CygWin + GCC
|
||||
#
|
||||
# Development version without optimizations & libtool
|
||||
# and no installation..
|
||||
# and no installation
|
||||
#
|
||||
|
||||
include $(TOP)/builds/cygwin/cygwinddef.mk
|
||||
|
|
|
|||
|
|
@ -28,3 +28,4 @@ endif
|
|||
|
||||
include $(TOP)/builds/cygwin/install.mk
|
||||
|
||||
# EOF
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# FreeType 2 configuration rules templates for
|
||||
# developement under Unix with no configure (gcc only)
|
||||
# development under Unix with no configure (gcc only)
|
||||
#
|
||||
|
||||
# Copyright 1996-2000 by
|
||||
|
|
@ -20,8 +20,10 @@ TOP := $(shell cd $(TOP); pwd)
|
|||
DELETE := rm -f
|
||||
SEP := /
|
||||
HOSTSEP := $(SEP)
|
||||
BUILD := $(TOP)/builds/cygwin/devel # we use a special devel ftoption.h
|
||||
PLATFORM := cygwindev # do not set it to 'cygwin', or libtool will trick you
|
||||
# we use a special devel ftoption.h
|
||||
BUILD := $(TOP)/builds/cygwin/devel
|
||||
# do not set it to 'cygwin', or libtool will trick you
|
||||
PLATFORM := cygwindev
|
||||
|
||||
# The directory where all object files are placed.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -46,9 +46,8 @@ ifeq ($(PLATFORM),ansi)
|
|||
COPY := cp
|
||||
DELETE := rm -f
|
||||
|
||||
|
||||
# If `devel' is the requested target, we use a special configuration
|
||||
# file named "cygwin-dev.mk". It disables optimization and libtool..
|
||||
# file named `cygwin-dev.mk'. It disables optimization and libtool.
|
||||
#
|
||||
ifneq ($(findstring devel,$(MAKECMDGOALS)),)
|
||||
CONFIG_FILE := cygwin-dev.mk
|
||||
|
|
@ -71,7 +70,8 @@ ifeq ($(PLATFORM),ansi)
|
|||
setup: std_setup
|
||||
|
||||
cygwin-def.mk: builds/cygwin/cygwin-def.in
|
||||
cd builds/cygwin; $(USE_CFLAGS) CONFIG_SHELL=/bin/bash ./configure $(CFG)
|
||||
cd builds/cygwin; \
|
||||
$(USE_CFLAGS) CONFIG_SHELL=/bin/bash ./configure $(CFG)
|
||||
|
||||
endif # test CygWin
|
||||
endif # test PLATFORM
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#
|
||||
|
||||
# Unix installation and deinstallation targets.
|
||||
|
||||
install: $(PROJECT_LIBRARY)
|
||||
$(MKINSTALLDIRS) $(libdir) \
|
||||
$(includedir)/freetype/config \
|
||||
|
|
@ -48,6 +49,4 @@
|
|||
-$(DELDIR) $(OBJ_DIR)/.libs
|
||||
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
|
||||
|
||||
|
||||
|
||||
# EOF
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ ifeq ($(PLATFORM),ansi)
|
|||
|
||||
ifdef COMSPEC
|
||||
#
|
||||
# we try to recognize a Cygwin session, in which case we're
|
||||
# certainly not running on DOS !!
|
||||
# We try to recognize a Cygwin session, in which case we're
|
||||
# certainly not running on DOS!
|
||||
#
|
||||
ifneq ($(OSTYPE),cygwin)
|
||||
is_dos := $(findstring Dos,$(shell ver))
|
||||
|
|
|
|||
13
docs/BUILD
13
docs/BUILD
|
|
@ -1,4 +1,7 @@
|
|||
|
||||
|
||||
FreeType 2 compilation how-to
|
||||
=============================
|
||||
|
||||
|
||||
Introduction:
|
||||
|
|
@ -8,8 +11,8 @@ document instructions on how to compile the library on your favorite
|
|||
platform.
|
||||
|
||||
|
||||
I. QUICK COMMAND-LINE GUIDE:
|
||||
----------------------------
|
||||
I. QUICK COMMAND-LINE GUIDE
|
||||
---------------------------
|
||||
|
||||
Install GNU Make, then try the following on Unix or any system with gcc:
|
||||
|
||||
|
|
@ -34,12 +37,12 @@ I. QUICK COMMAND-LINE GUIDE:
|
|||
make
|
||||
|
||||
|
||||
If this doesn't work, read the following..
|
||||
If this doesn't work, read the following.
|
||||
|
||||
|
||||
|
||||
II. COMMAND-LINE COMPILATION:
|
||||
-----------------------------
|
||||
II. COMMAND-LINE COMPILATION
|
||||
----------------------------
|
||||
|
||||
Note that if you do not want to compile FreeType 2 from a command line
|
||||
shell, please skip to section III below (DETAILED COMPILATION)
|
||||
|
|
|
|||
|
|
@ -332,9 +332,12 @@
|
|||
FT_Int max = outline->max_points;
|
||||
|
||||
|
||||
if ( REALLOC_ARRAY( outline->points, max, news, AH_Point ) ||
|
||||
REALLOC_ARRAY( outline->horz_edges, max*2, news*2, AH_Edge ) ||
|
||||
REALLOC_ARRAY( outline->horz_segments, max*2, news*2, AH_Segment ) )
|
||||
if ( REALLOC_ARRAY( outline->points,
|
||||
max, news, AH_Point ) ||
|
||||
REALLOC_ARRAY( outline->horz_edges,
|
||||
max * 2, news * 2, AH_Edge ) ||
|
||||
REALLOC_ARRAY( outline->horz_segments,
|
||||
max * 2, news * 2, AH_Segment ) )
|
||||
goto Exit;
|
||||
|
||||
/* readjust some pointers */
|
||||
|
|
|
|||
|
|
@ -220,8 +220,7 @@
|
|||
matrix->xy = temp[2];
|
||||
matrix->yy = temp[3];
|
||||
|
||||
/* note that the font offset are expressed in */
|
||||
/* integer font units.. */
|
||||
/* note that the font offsets are expressed in integer font units */
|
||||
offset->x = temp[4] >> 16;
|
||||
offset->y = temp[5] >> 16;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -913,8 +913,7 @@
|
|||
matrix->xy = temp[2];
|
||||
matrix->yy = temp[3];
|
||||
|
||||
/* note that the offset must be expressed in */
|
||||
/* integer font units.. */
|
||||
/* note that the offsets must be expressed in integer font units */
|
||||
offset->x = temp[4] >> 16;
|
||||
offset->y = temp[5] >> 16;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue