rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fix for `make devel'. 

* builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use
pkg-config for bzip2 since not all GNU/Linux distributions have
`bzip2.pc' (and the header file `bzlib.h' is located in /usr/include
normally).
This commit is contained in:
Werner Lemberg 2014-03-04 04:40:07 +01:00
parent 7ac76b50da
commit f48f7dc84b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2014-03-04 Werner Lemberg <wl@gnu.org>
Minor fix for `make devel'.
* builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use
pkg-config for bzip2 since not all GNU/Linux distributions have
`bzip2.pc' (and the header file `bzlib.h' is located in /usr/include
normally).
2014-03-04 Sean McBride <sean@rogue-research.com> 2014-03-04 Sean McBride <sean@rogue-research.com>
Fix several clang static analyzer dead store warnings. Fix several clang static analyzer dead store warnings.

5
builds/freetype.mk
View File

@ -3,7 +3,7 @@
# #
# Copyright 1996-2006, 2008, 2013 by # Copyright 1996-2006, 2008, 2013, 2014 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, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -130,8 +130,7 @@ ifdef DEVEL_DIR
# We assume that all library dependencies for FreeType are fulfilled for a # We assume that all library dependencies for FreeType are fulfilled for a
# development build, so we directly access the necessary include directory # development build, so we directly access the necessary include directory
# information using `pkg-config'. # information using `pkg-config'.
INCLUDE_FLAGS += $(shell pkg-config --cflags bzip2 \ INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \
libpng \
harfbuzz ) harfbuzz )
endif endif