Compatibility with SDL2_Pango 0.1.3
Include all headers needed by SDL2_Pango when building the fonts file by querying pkg-config.
This commit is contained in:
parent
28888c1842
commit
633a3628d6
2 changed files with 5 additions and 0 deletions
2
Makefile
2
Makefile
|
|
@ -294,6 +294,7 @@ NOSOUNDFLAG:=$(if $(SDL_MIXER_LIB),,-DNOSOUND$(warning -lSDL2_Mixer failed, no s
|
|||
|
||||
# SDL Pango is needed to render complex scripts like Thai and Arabic
|
||||
SDL2_PANGO_LIB:=$(call linktest,SDL2_Pango,-lSDL2_Pango,$(SDL_LIBS))
|
||||
SDL2_PANGO_CFLAGS:=$(shell $(PKG_CONFIG) --cflags SDL2_Pango)
|
||||
NOPANGOFLAG:=$(if $(SDL2_PANGO_LIB),,-DNO_SDLPANGO$(warning -lSDL2_Pango failed, no scripts for you!))
|
||||
|
||||
SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL2_PANGO_LIB)
|
||||
|
|
@ -341,6 +342,7 @@ CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
|
|||
-Waggregate-return \
|
||||
-Wstrict-prototypes -Wmissing-prototypes \
|
||||
$(shell src/test-option.sh -Wstrict-aliasing=2) \
|
||||
$(SDL2_PANGO_CFLAGS) \
|
||||
$(ARCH_CFLAGS)
|
||||
|
||||
DEFS:=-DVER_DATE=\"$(VER_DATE)\" -DVER_VERSION=\"$(VER_VERSION)\" \
|
||||
|
|
|
|||
|
|
@ -71,6 +71,9 @@ http://www.tuxpaint.org/
|
|||
Terrence Sheflin <terrence.sheflin@gmail.com>
|
||||
Pere Pujal i Carabantes <perepujal@gmail.com>
|
||||
|
||||
* Compatibility with SDL2_Pango 0.1.3.
|
||||
Mark Kim <markuskimius@gmail.com>
|
||||
|
||||
* Documentation updates:
|
||||
---------------------
|
||||
* Update macOS build instructions for SDL2.0.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue