diff --git a/Makefile b/Makefile index 91d2a97d2..55748f5df 100644 --- a/Makefile +++ b/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)\" \ diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index fe0320dcf..0780ff213 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -71,6 +71,9 @@ http://www.tuxpaint.org/ Terrence Sheflin Pere Pujal i Carabantes + * Compatibility with SDL2_Pango 0.1.3. + Mark Kim + * Documentation updates: --------------------- * Update macOS build instructions for SDL2.0.