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).
This commit is contained in:
parent
796f9de262
commit
321cd27d0f
|
@ -16,6 +16,7 @@
|
|||
ifndef TOP
|
||||
TOP := .
|
||||
endif
|
||||
TOP := $(shell cd $(TOP); pwd)
|
||||
|
||||
DELETE := @RMF@
|
||||
DELDIR := @RMDIR@
|
||||
|
@ -57,15 +58,16 @@ version_info := @version_info@
|
|||
|
||||
# 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.
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -61,12 +61,15 @@
|
|||
#define FT_COMPONENT trace_ttobjs
|
||||
|
||||
|
||||
#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* GLYPH ZONE FUNCTIONS */
|
||||
/* */
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
/* <Function> */
|
||||
|
@ -141,6 +144,8 @@
|
|||
return error;
|
||||
}
|
||||
|
||||
#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
|
|
|
@ -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,
|
||||
|
@ -114,6 +116,8 @@
|
|||
FT_Short maxContours,
|
||||
TT_GlyphZone* zone );
|
||||
|
||||
#endif /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/* */
|
||||
|
|
Loading…
Reference in New Issue