From 441c7281fbc57a82e56ccbd2e0b2b82429fefd92 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 12 Jul 2021 00:37:02 +0300
Subject: [PATCH] multiple updates to build system:
- fix windows builds when using the in-tree harfbuzz sources:
added missing harfbuzz sources to Makefile.am and adjusted
the custom harfbuzz config.h file.
- ft2 and harfbuzz cflags and libs now only apply to libSDL_ttf,
not to extra programs, i.e. showfont and glfont.
- fixes to make dist, so that external/*/.deps are not packaged.
- fixes to make distclean, so that external/*/.deps are removed.
---
Makefile.am | 21 ++-
Makefile.in | 116 +++++++++---
acinclude/freetype2.m4 | 13 +-
configure | 60 ++++---
configure.ac | 16 +-
external/harfbuzz-2.8.0/config.h | 11 +-
...config_sdl_android.h => config_sdl_unix.h} | 4 +-
external/harfbuzz-2.8.0/config_sdl_win32.h | 167 ++++++++++++++++++
8 files changed, 334 insertions(+), 74 deletions(-)
rename external/harfbuzz-2.8.0/{config_sdl_android.h => config_sdl_unix.h} (98%)
create mode 100644 external/harfbuzz-2.8.0/config_sdl_win32.h
diff --git a/Makefile.am b/Makefile.am
index 1b59d1a..55e0821 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,9 @@ libSDL2_ttfinclude_HEADERS = \
SDL_ttf.h
libSDL2_ttf_la_SOURCES = \
- SDL_ttf.c
+ SDL_ttf.c $(LOCAL_FT2_SOURCES) $(LOCAL_HB_SOURCES)
-libSDL2_ttf_la_CPPFLAGS =
+libSDL2_ttf_la_CPPFLAGS = $(TTF_CPPFLAGS) $(LOCAL_FT2_FLAGS) $(LOCAL_HB_FLAGS)
FREETYPE_PATH = external/freetype-2.10.4
FREETYPE_SOURCES = \
@@ -56,8 +56,8 @@ FREETYPE_SOURCES = \
$(FREETYPE_PATH)/src/winfonts/winfnt.c
if USE_BUILTIN_FREETYPE
-libSDL2_ttf_la_SOURCES += $(FREETYPE_SOURCES)
-libSDL2_ttf_la_CPPFLAGS += -I$(srcdir)/$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
+LOCAL_FT2_FLAGS = -I$(srcdir)/$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
+LOCAL_FT2_SOURCES = $(FREETYPE_SOURCES)
endif
HARFBUZZ_PATH = external/harfbuzz-2.8.0
@@ -104,11 +104,14 @@ HARFBUZZ_SOURCES = \
$(HARFBUZZ_PATH)/src/hb-shaper.cc \
$(HARFBUZZ_PATH)/src/hb-static.cc \
$(HARFBUZZ_PATH)/src/hb-ucd.cc \
+ $(HARFBUZZ_PATH)/src/hb-coretext.cc \
+ $(HARFBUZZ_PATH)/src/hb-gdi.cc \
+ $(HARFBUZZ_PATH)/src/hb-uniscribe.cc \
$(HARFBUZZ_PATH)/src/hb-unicode.cc
if USE_BUILTIN_HARFBUZZ
-libSDL2_ttf_la_SOURCES += $(HARFBUZZ_SOURCES)
-libSDL2_ttf_la_CPPFLAGS += -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
+LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
+LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
if OS_WIN32
LINKER = $(CXXLINK)
else
@@ -131,7 +134,7 @@ libSDL2_ttf_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
endif
libSDL2_ttf_la_LINK = $(LINKER) $(libSDL2_ttf_la_LDFLAGS)
-libSDL2_ttf_la_LIBADD = @MATHLIB@
+libSDL2_ttf_la_LIBADD = $(TTF_LIBS) @MATHLIB@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = SDL2_ttf.pc
@@ -167,3 +170,7 @@ $(PACKAGE)-$(VERSION).tar.gz: distcheck
rpm: $(PACKAGE)-$(VERSION).tar.gz
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+distclean-local:
+ -rm -rf `find $(srcdir) -name .deps`
+dist-hook:
+ -rm -rf `find $(distdir) -name .deps`
diff --git a/Makefile.in b/Makefile.in
index 8b1e0dd..4a686e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,11 +91,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@USE_BUILTIN_FREETYPE_TRUE@am__append_1 = $(FREETYPE_SOURCES)
-@USE_BUILTIN_FREETYPE_TRUE@am__append_2 = -I$(srcdir)/$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
-@USE_BUILTIN_HARFBUZZ_TRUE@am__append_3 = $(HARFBUZZ_SOURCES)
-@USE_BUILTIN_HARFBUZZ_TRUE@am__append_4 = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
-@USE_VERSION_RC_FALSE@libSDL2_ttf_la_DEPENDENCIES =
+@USE_VERSION_RC_FALSE@libSDL2_ttf_la_DEPENDENCIES = \
+@USE_VERSION_RC_FALSE@ $(am__DEPENDENCIES_1)
noinst_PROGRAMS = showfont$(EXEEXT) glfont$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -150,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
"$(DESTDIR)$(libSDL2_ttfincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
am__libSDL2_ttf_la_SOURCES_DIST = SDL_ttf.c \
$(FREETYPE_PATH)/src/autofit/autofit.c \
$(FREETYPE_PATH)/src/base/ftbase.c \
@@ -231,6 +229,9 @@ am__libSDL2_ttf_la_SOURCES_DIST = SDL_ttf.c \
$(HARFBUZZ_PATH)/src/hb-shaper.cc \
$(HARFBUZZ_PATH)/src/hb-static.cc \
$(HARFBUZZ_PATH)/src/hb-ucd.cc \
+ $(HARFBUZZ_PATH)/src/hb-coretext.cc \
+ $(HARFBUZZ_PATH)/src/hb-gdi.cc \
+ $(HARFBUZZ_PATH)/src/hb-uniscribe.cc \
$(HARFBUZZ_PATH)/src/hb-unicode.cc
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = \
@@ -317,6 +318,9 @@ am__objects_3 = $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-aat-layout.lo \
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-shaper.lo \
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-static.lo \
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-ucd.lo \
+ $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo \
+ $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo \
+ $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo \
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-unicode.lo
@USE_BUILTIN_HARFBUZZ_TRUE@am__objects_4 = $(am__objects_3)
am_libSDL2_ttf_la_OBJECTS = libSDL2_ttf_la-SDL_ttf.lo $(am__objects_2) \
@@ -393,10 +397,12 @@ am__depfiles_remade = $(FREETYPE_PATH)/src/autofit/$(DEPDIR)/libSDL2_ttf_la-auto
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer-serialize.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-common.Plo \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-face.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-fallback-shape.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-font.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ft.Plo \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-number.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff1-table.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff2-table.Plo \
@@ -430,6 +436,7 @@ am__depfiles_remade = $(FREETYPE_PATH)/src/autofit/$(DEPDIR)/libSDL2_ttf_la-auto
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-static.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ucd.Plo \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Plo \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Plo \
./$(DEPDIR)/glfont.Po ./$(DEPDIR)/libSDL2_ttf_la-SDL_ttf.Plo \
./$(DEPDIR)/showfont.Po
am__mv = mv -f
@@ -611,6 +618,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TTF_CFLAGS = @TTF_CFLAGS@
+TTF_LIBS = @TTF_LIBS@
VERSION = @VERSION@
WINDRES = @WINDRES@
XMKMF = @XMKMF@
@@ -680,8 +689,10 @@ libSDL2_ttfincludedir = $(includedir)/SDL2
libSDL2_ttfinclude_HEADERS = \
SDL_ttf.h
-libSDL2_ttf_la_SOURCES = SDL_ttf.c $(am__append_1) $(am__append_3)
-libSDL2_ttf_la_CPPFLAGS = $(am__append_2) $(am__append_4)
+libSDL2_ttf_la_SOURCES = \
+ SDL_ttf.c $(LOCAL_FT2_SOURCES) $(LOCAL_HB_SOURCES)
+
+libSDL2_ttf_la_CPPFLAGS = $(TTF_CPPFLAGS) $(LOCAL_FT2_FLAGS) $(LOCAL_HB_FLAGS)
FREETYPE_PATH = external/freetype-2.10.4
FREETYPE_SOURCES = \
$(FREETYPE_PATH)/src/autofit/autofit.c \
@@ -725,6 +736,8 @@ FREETYPE_SOURCES = \
$(FREETYPE_PATH)/src/type42/type42.c \
$(FREETYPE_PATH)/src/winfonts/winfnt.c
+@USE_BUILTIN_FREETYPE_TRUE@LOCAL_FT2_FLAGS = -I$(srcdir)/$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
+@USE_BUILTIN_FREETYPE_TRUE@LOCAL_FT2_SOURCES = $(FREETYPE_SOURCES)
HARFBUZZ_PATH = external/harfbuzz-2.8.0
HARFBUZZ_SOURCES = \
$(HARFBUZZ_PATH)/src/hb-aat-layout.cc \
@@ -769,8 +782,13 @@ HARFBUZZ_SOURCES = \
$(HARFBUZZ_PATH)/src/hb-shaper.cc \
$(HARFBUZZ_PATH)/src/hb-static.cc \
$(HARFBUZZ_PATH)/src/hb-ucd.cc \
+ $(HARFBUZZ_PATH)/src/hb-coretext.cc \
+ $(HARFBUZZ_PATH)/src/hb-gdi.cc \
+ $(HARFBUZZ_PATH)/src/hb-uniscribe.cc \
$(HARFBUZZ_PATH)/src/hb-unicode.cc
+@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_FLAGS = -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
+@USE_BUILTIN_HARFBUZZ_TRUE@LOCAL_HB_SOURCES = $(HARFBUZZ_SOURCES)
@OS_WIN32_FALSE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(LINK)
@OS_WIN32_TRUE@@USE_BUILTIN_HARFBUZZ_TRUE@LINKER = $(CXXLINK)
@USE_BUILTIN_HARFBUZZ_FALSE@LINKER = $(LINK)
@@ -786,7 +804,7 @@ HARFBUZZ_SOURCES = \
@USE_VERSION_RC_TRUE@libSDL2_ttf_la_DEPENDENCIES = version.o
libSDL2_ttf_la_LINK = $(LINKER) $(libSDL2_ttf_la_LDFLAGS)
-libSDL2_ttf_la_LIBADD = @MATHLIB@
+libSDL2_ttf_la_LIBADD = $(TTF_LIBS) @MATHLIB@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = SDL2_ttf.pc
EXTRA_DIST = \
@@ -1270,6 +1288,15 @@ $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-static.lo: \
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-ucd.lo: \
$(HARFBUZZ_PATH)/src/$(am__dirstamp) \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/$(am__dirstamp)
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo: \
+ $(HARFBUZZ_PATH)/src/$(am__dirstamp) \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/$(am__dirstamp)
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo: \
+ $(HARFBUZZ_PATH)/src/$(am__dirstamp) \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/$(am__dirstamp)
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo: \
+ $(HARFBUZZ_PATH)/src/$(am__dirstamp) \
+ $(HARFBUZZ_PATH)/src/$(DEPDIR)/$(am__dirstamp)
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-unicode.lo: \
$(HARFBUZZ_PATH)/src/$(am__dirstamp) \
$(HARFBUZZ_PATH)/src/$(DEPDIR)/$(am__dirstamp)
@@ -1381,10 +1408,12 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer-serialize.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-common.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-face.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-fallback-shape.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-font.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ft.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-number.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff1-table.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff2-table.Plo@am__quote@ # am--include-marker
@@ -1418,6 +1447,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-static.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ucd.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@$(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glfont.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSDL2_ttf_la-SDL_ttf.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showfont.Po@am__quote@ # am--include-marker
@@ -2057,6 +2087,27 @@ $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-ucd.lo: $(HARFBUZZ_PATH)/src/hb-ucd.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-ucd.lo `test -f '$(HARFBUZZ_PATH)/src/hb-ucd.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-ucd.cc
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo: $(HARFBUZZ_PATH)/src/hb-coretext.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo -MD -MP -MF $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Tpo -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo `test -f '$(HARFBUZZ_PATH)/src/hb-coretext.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-coretext.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Tpo $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(HARFBUZZ_PATH)/src/hb-coretext.cc' object='$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-coretext.lo `test -f '$(HARFBUZZ_PATH)/src/hb-coretext.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-coretext.cc
+
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo: $(HARFBUZZ_PATH)/src/hb-gdi.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo -MD -MP -MF $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Tpo -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo `test -f '$(HARFBUZZ_PATH)/src/hb-gdi.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-gdi.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Tpo $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(HARFBUZZ_PATH)/src/hb-gdi.cc' object='$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-gdi.lo `test -f '$(HARFBUZZ_PATH)/src/hb-gdi.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-gdi.cc
+
+$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo: $(HARFBUZZ_PATH)/src/hb-uniscribe.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo -MD -MP -MF $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Tpo -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo `test -f '$(HARFBUZZ_PATH)/src/hb-uniscribe.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-uniscribe.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Tpo $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$(HARFBUZZ_PATH)/src/hb-uniscribe.cc' object='$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-uniscribe.lo `test -f '$(HARFBUZZ_PATH)/src/hb-uniscribe.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-uniscribe.cc
+
$(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-unicode.lo: $(HARFBUZZ_PATH)/src/hb-unicode.cc
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSDL2_ttf_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-unicode.lo -MD -MP -MF $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Tpo -c -o $(HARFBUZZ_PATH)/src/libSDL2_ttf_la-hb-unicode.lo `test -f '$(HARFBUZZ_PATH)/src/hb-unicode.cc' || echo '$(srcdir)/'`$(HARFBUZZ_PATH)/src/hb-unicode.cc
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Tpo $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Plo
@@ -2231,6 +2282,9 @@ distdir-am: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
@@ -2502,10 +2556,12 @@ distclean: distclean-am
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer-serialize.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-common.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-face.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-fallback-shape.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-font.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ft.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-number.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff1-table.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff2-table.Plo
@@ -2539,12 +2595,13 @@ distclean: distclean-am
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-static.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ucd.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Plo
-rm -f ./$(DEPDIR)/glfont.Po
-rm -f ./$(DEPDIR)/libSDL2_ttf_la-SDL_ttf.Plo
-rm -f ./$(DEPDIR)/showfont.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-libtool distclean-local distclean-tags
dvi: dvi-am
@@ -2636,10 +2693,12 @@ maintainer-clean: maintainer-clean-am
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer-serialize.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-buffer.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-common.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-coretext.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-face.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-fallback-shape.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-font.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ft.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-gdi.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-number.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff1-table.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ot-cff2-table.Plo
@@ -2673,6 +2732,7 @@ maintainer-clean: maintainer-clean-am
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-static.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-ucd.Plo
-rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-unicode.Plo
+ -rm -f $(HARFBUZZ_PATH)/src/$(DEPDIR)/libSDL2_ttf_la-hb-uniscribe.Plo
-rm -f ./$(DEPDIR)/glfont.Po
-rm -f ./$(DEPDIR)/libSDL2_ttf_la-SDL_ttf.Plo
-rm -f ./$(DEPDIR)/showfont.Po
@@ -2700,22 +2760,23 @@ uninstall-am: uninstall-libLTLIBRARIES \
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
check-am clean clean-cscope clean-generic clean-libLTLIBRARIES \
clean-libtool clean-noinstPROGRAMS cscope cscopelist-am ctags \
- ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
- dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libLTLIBRARIES install-libSDL2_ttfincludeHEADERS \
- install-man install-pdf install-pdf-am install-pkgconfigDATA \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \
- uninstall-libSDL2_ttfincludeHEADERS uninstall-pkgconfigDATA
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-libLTLIBRARIES \
+ install-libSDL2_ttfincludeHEADERS install-man install-pdf \
+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-libLTLIBRARIES uninstall-libSDL2_ttfincludeHEADERS \
+ uninstall-pkgconfigDATA
.PRECIOUS: Makefile
@@ -2730,6 +2791,11 @@ $(PACKAGE)-$(VERSION).tar.gz: distcheck
rpm: $(PACKAGE)-$(VERSION).tar.gz
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+distclean-local:
+ -rm -rf `find $(srcdir) -name .deps`
+dist-hook:
+ -rm -rf `find $(distdir) -name .deps`
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/acinclude/freetype2.m4 b/acinclude/freetype2.m4
index d8ee404..478a422 100644
--- a/acinclude/freetype2.m4
+++ b/acinclude/freetype2.m4
@@ -1,7 +1,7 @@
# Configure paths for FreeType2
-# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+# Marcelo Magallon 2001-10-26, based on `gtk.m4` by Owen Taylor
#
-# Copyright (C) 2001-2020 by
+# Copyright (C) 2001-2021 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,15 +15,19 @@
# generated by Autoconf, under the same distribution terms as the rest of
# that program.
#
-# serial 5
+# serial 6
# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
-# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+# MINIMUM-VERSION is what libtool reports; the default is '7.0.1' (this is
# FreeType 2.0.4).
#
+# To make this code work with older autoconf versions, `AS_HELP_STRING` is
+# not quoted.
+#
AC_DEFUN([AC_CHECK_FT2],
[# Get the cflags and libraries from the freetype-config script
+ #
AC_ARG_WITH([ft-prefix],
AS_HELP_STRING([--with-ft-prefix=PREFIX],
[Prefix where FreeType is installed (optional)]),
@@ -186,4 +190,5 @@ main()
AC_SUBST([FT2_CFLAGS])
AC_SUBST([FT2_LIBS])])
+
# end of freetype2.m4
diff --git a/configure b/configure
index eb0be03..4ba16cf 100755
--- a/configure
+++ b/configure
@@ -775,6 +775,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+TTF_LIBS
+TTF_CFLAGS
MATHLIB
GL_LIBS
X_EXTRA_LIBS
@@ -4283,13 +4285,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4286: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4288: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4289: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4291: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4292: output\"" >&5)
+ (eval echo "\"\$as_me:4294: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5500,7 +5502,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5503 "configure"' > conftest.$ac_ext
+ echo '#line 5505 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7330,11 +7332,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7333: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7335: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7337: \$? = $ac_status" >&5
+ echo "$as_me:7339: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7669,11 +7671,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7672: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7674: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7676: \$? = $ac_status" >&5
+ echo "$as_me:7678: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7774,11 +7776,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7781: \$? = $ac_status" >&5
+ echo "$as_me:7783: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7829,11 +7831,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7832: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7834: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7836: \$? = $ac_status" >&5
+ echo "$as_me:7838: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10199,7 +10201,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10202 "configure"
+#line 10204 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10295,7 +10297,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10298 "configure"
+#line 10300 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14545,11 +14547,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14548: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14550: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14552: \$? = $ac_status" >&5
+ echo "$as_me:14554: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14644,11 +14646,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14647: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14649: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14651: \$? = $ac_status" >&5
+ echo "$as_me:14653: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14696,11 +14698,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14699: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14703: \$? = $ac_status" >&5
+ echo "$as_me:14705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16517,6 +16519,8 @@ rm -f core conftest.err conftest.$ac_objext \
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
+TTF_LIBS=
+TTF_CPPFLAGS=
# Check whether
(Patch may be truncated, please check the link at the top of this post.)