* builds/unix/ft2unix.h: Remove. No longer necessary.
* builds/unix/install.mk (install): Updated.
This commit is contained in:
Werner Lemberg
parent
fae3820764
commit
c52b129ccd
|
|
@ -1,3 +1,9 @@
|
||||||
|
2013-11-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* builds/unix/ft2unix.h: Remove. No longer necessary.
|
||||||
|
|
||||||
|
* builds/unix/install.mk (install): Updated.
|
||||||
|
|
||||||
2013-11-13 Werner Lemberg <wl@gnu.org>
|
2013-11-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Simplify header file hierarchy.
|
Simplify header file hierarchy.
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
/***************************************************************************/
|
|
||||||
/* */
|
|
||||||
/* ft2build.h */
|
|
||||||
/* */
|
|
||||||
/* Build macros of the FreeType 2 library. */
|
|
||||||
/* */
|
|
||||||
/* Copyright 1996-2001, 2003, 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. */
|
|
||||||
/* */
|
|
||||||
/***************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
/* */
|
|
||||||
/* This is a Unix-specific version of <ft2build.h> that should be used */
|
|
||||||
/* exclusively *after* installation of the library. */
|
|
||||||
/* */
|
|
||||||
/* It assumes that `/usr/local/include/freetype2' (or whatever is */
|
|
||||||
/* returned by the `freetype-config --cflags' or `pkg-config --cflags' */
|
|
||||||
/* command) is in your compilation include path. */
|
|
||||||
/* */
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __FT2_BUILD_UNIX_H__
|
|
||||||
#define __FT2_BUILD_UNIX_H__
|
|
||||||
|
|
||||||
/* `<prefix>/include/freetype2' must be in your current inclusion path */
|
|
||||||
#include <config/ftheader.h>
|
|
||||||
|
|
||||||
#endif /* __FT2_BUILD_UNIX_H__ */
|
|
||||||
|
|
||||||
|
|
||||||
/* END */
|
|
||||||
|
|
@ -48,8 +48,6 @@ install: $(PROJECT_LIBRARY)
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
|
||||||
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
|
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
|
||||||
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
|
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
|
||||||
$(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
|
|
||||||
$(DESTDIR)$(includedir)/ft2build.h
|
|
||||||
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
|
||||||
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
|
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
|
||||||
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
|
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
|
||||||
|
|
|
||||||
|
|
@ -2,10 +2,9 @@
|
||||||
/* */
|
/* */
|
||||||
/* ft2build.h */
|
/* ft2build.h */
|
||||||
/* */
|
/* */
|
||||||
/* FreeType 2 build and setup macros. */
|
/* FreeType 2 build and setup macros (development version). */
|
||||||
/* (Generic version) */
|
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2003, 2006 by */
|
/* Copyright 1996-2001, 2003, 2006, 2013 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
|
@ -18,24 +17,24 @@
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is a development version of <ft2build.h> that is used
|
* This is a development version of <ft2build.h> to build the library in
|
||||||
* to build the library in debug mode. Its only difference with
|
* debug mode. Its only difference to the default version is that it
|
||||||
* the reference is that it forces the use of the local `ftoption.h'
|
* includes a local `ftoption.h' header file with different settings for
|
||||||
* which contains different settings for all configuration macros.
|
* many configuration macros.
|
||||||
|
*
|
||||||
|
* To use it, simply ensure that the directory containing this file is
|
||||||
|
* scanned by the compiler before the default FreeType header directory.
|
||||||
*
|
*
|
||||||
* To use it, you must define the environment variable FT2_BUILD_INCLUDE
|
|
||||||
* to point to the directory containing these two files (`ft2build.h' and
|
|
||||||
* `ftoption.h'), then invoke Jam as usual.
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __FT2_BUILD_DEVEL_H__
|
#ifndef __FT2BUILD_H__
|
||||||
#define __FT2_BUILD_DEVEL_H__
|
#define __FT2BUILD_H__
|
||||||
|
|
||||||
#define FT_CONFIG_OPTIONS_H <ftoption.h>
|
#define FT_CONFIG_OPTIONS_H <ftoption.h>
|
||||||
|
|
||||||
#include <config/ftheader.h>
|
#include <config/ftheader.h>
|
||||||
|
|
||||||
#endif /* __FT2_BUILD_DEVEL_H__ */
|
#endif /* __FT2BUILD_H__ */
|
||||||
|
|
||||||
|
|
||||||
/* END */
|
/* END */
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
/* ft2build.h */
|
/* ft2build.h */
|
||||||
/* */
|
/* */
|
||||||
/* FreeType 2 build and setup macros. */
|
/* FreeType 2 build and setup macros. */
|
||||||
/* (Generic version) */
|
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2006, 2013 by */
|
/* Copyright 1996-2001, 2006, 2013 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
|
|
@ -19,21 +18,25 @@
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
/* */
|
/* */
|
||||||
/* This file corresponds to the default `ft2build.h' file for */
|
/* This is the `entry point' for FreeType header file inclusions. It is */
|
||||||
/* FreeType 2. It uses the `freetype' include root. */
|
/* the only header file which should be included directly; all other */
|
||||||
|
/* FreeType header files should be accessed with macro names (after */
|
||||||
|
/* including `ft2build.h'). */
|
||||||
/* */
|
/* */
|
||||||
/* Note that specific platforms might use a different configuration. */
|
/* A typical example is */
|
||||||
/* See builds/unix/ft2unix.h for an example. */
|
/* */
|
||||||
|
/* #include <ft2build.h> */
|
||||||
|
/* #include FT_FREETYPE_H */
|
||||||
/* */
|
/* */
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#ifndef __FT2_BUILD_GENERIC_H__
|
#ifndef __FT2BUILD_H__
|
||||||
#define __FT2_BUILD_GENERIC_H__
|
#define __FT2BUILD_H__
|
||||||
|
|
||||||
#include <config/ftheader.h>
|
#include <config/ftheader.h>
|
||||||
|
|
||||||
#endif /* __FT2_BUILD_GENERIC_H__ */
|
#endif /* __FT2BUILD_H__ */
|
||||||
|
|
||||||
|
|
||||||
/* END */
|
/* END */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue