ref: 321cd27d0f89f8646c95218b16dca4a3c02d7f17
parent: 796f9de26235f753aea8af8d09e19ed660f235c9
author: Werner Lemberg <[email protected]>
date: Thu Jul 27 07:20:20 EDT 2000
Removing compiler warnings about unused portions of code. Now unix.in uses absolute paths also to overcome problems with libtool. To do that in a consistent way I had to modify the rules how to handle $OBJ_DIR (and consequently $LIB_DIR): You should set $OBJ_DIR explicitly on the command line (or environment).
--- a/builds/unix/unix.in
+++ b/builds/unix/unix.in
@@ -16,6 +16,7 @@
ifndef TOP
TOP := .
endif
+TOP := $(shell cd $(TOP); pwd)
DELETE := @RMF@
DELDIR := @RMDIR@
@@ -57,15 +58,16 @@
# The directory where all object files are placed.
#
-# Note that this is not $(TOP)/obj!
# This lets you build the library in your own directory with something like
#
# set TOP=.../path/to/freetype2/top/dir...
-# mkdir obj
+# set OBJ_DIR=.../path/to/obj/dir
# make -f $TOP/Makefile setup [options]
# make -f $TOP/Makefile
#
-OBJ_DIR := obj
+ifndef OBJ_DIR
+ OBJ_DIR := $(shell cd $(TOP)/obj; pwd)
+endif
# The directory where all library files are placed.
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -659,7 +659,11 @@
FT_Error load_truetype_glyph( TT_Loader* loader,
FT_UInt glyph_index )
{+
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
FT_Stream stream = loader->stream;
+#endif
+
FT_Error error;
TT_Face face = (TT_Face)loader->face;
FT_ULong offset;
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -61,6 +61,8 @@
#define FT_COMPONENT trace_ttobjs
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
/*************************************************************************/
/* */
/* GLYPH ZONE FUNCTIONS */
@@ -67,6 +69,7 @@
/* */
/*************************************************************************/
+
/*************************************************************************/
/* */
/* <Function> */
@@ -140,6 +143,8 @@
return error;
}
+
+#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
/*************************************************************************/
--- a/src/truetype/ttobjs.h
+++ b/src/truetype/ttobjs.h
@@ -107,6 +107,8 @@
} TT_GraphicsState;
+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
LOCAL_DEF void TT_Done_GlyphZone( TT_GlyphZone* zone );
LOCAL_DEF FT_Error TT_New_GlyphZone( FT_Memory memory,
@@ -113,6 +115,8 @@
FT_UShort maxPoints,
FT_Short maxContours,
TT_GlyphZone* zone );
+
+#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
/*************************************************************************/