Commit | Line | Data |
---|---|---|
29a2f61e NG |
1 | From: Markus Koschany <apo@debian.org> |
2 | Date: Thu, 8 Mar 2018 17:49:24 +0100 | |
3 | Subject: pkg-config | |
4 | ||
5 | Use pkg-config instead of the deprecated freetype-config command. | |
6 | ||
7 | Bug-Debian: https://bugs.debian.org/892338 | |
8 | Forwarded: no | |
9 | --- | |
10 | src/Makefile.am | 6 +++--- | |
11 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
12 | ||
13 | diff --git a/src/Makefile.am b/src/Makefile.am | |
14 | index 3b7d0fe..0f5a5dd 100644 | |
15 | --- a/src/Makefile.am | |
16 | +++ b/src/Makefile.am | |
17 | @@ -158,8 +158,8 @@ endif | |
18 | SDL_CFLAGS = `sdl-config --cflags`\r | |
19 | SDL_LIBS = `sdl-config --libs`\r | |
20 | \r | |
21 | -FREETYPE_CFLAGS = `freetype-config --cflags`\r | |
22 | -FREETYPE_LIBS = `freetype-config --libs`\r | |
23 | +FREETYPE_CFLAGS = `pkg-config --cflags freetype2`\r | |
24 | +FREETYPE_LIBS = `pkg-config --libs freetype2`\r | |
25 | \r | |
26 | if USE_MATHSINGLE\r | |
27 | MATH_CFLAGS = -DVMATH_SINGLE_PRECISION\r | |
28 | @@ -233,4 +233,4 @@ AM_CFLAGS = -Wall ${FREETYPE_CFLAGS} ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLA | |
29 | ${OPTIMIZATION_CFLAGS} ${USESSE_CFLAGS} ${USEWIN_CFLAGS} ${FASTMATH_CFLAGS} ${DEBIAN_CFLAGS} -lm\r | |
30 | \r | |
31 | AM_LDFLAGS = ${all_libraries} ${FREETYPE_LIBS} ${SDL_LIBS}\r | |
32 | -LDADD = ${LDADD_FLAGS} | |
33 | \ No newline at end of file | |
34 | +LDADD = ${LDADD_FLAGS}\r |