From 02467e3f6e74290593c8f104e28139a88df34907 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 9 Apr 2021 13:41:54 -0700
Subject: [PATCH] Fixed building from a different directory
---
Makefile.am | 4 ++--
Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d0e861b..c284f10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ FREETYPE_SOURCES := \
if USE_BUILTIN_FREETYPE
libSDL2_ttf_la_SOURCES += $(FREETYPE_SOURCES)
-libSDL2_ttf_la_CPPFLAGS += -I$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
+libSDL2_ttf_la_CPPFLAGS += -I$(srcdir)/$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
endif
HARFBUZZ_PATH := external/harfbuzz-2.8.0
@@ -110,7 +110,7 @@ HARFBUZZ_SOURCES := \
if USE_BUILTIN_HARFBUZZ
libSDL2_ttf_la_SOURCES += $(HARFBUZZ_SOURCES)
-libSDL2_ttf_la_CPPFLAGS += -I$(HARFBUZZ_PATH) -I$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
+libSDL2_ttf_la_CPPFLAGS += -I$(srcdir)/$(HARFBUZZ_PATH) -I$(srcdir)/$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
libSDL2_ttf_la_CXXFLAGS := -std=c++11
endif
diff --git a/Makefile.in b/Makefile.in
index 0da1825..ee9decc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,9 +92,9 @@ 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$(FREETYPE_PATH)/include -DFT2_BUILD_LIBRARY -DFT_PUBLIC_FUNCTION_ATTRIBUTE=
+@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$(HARFBUZZ_PATH) -I$(HARFBUZZ_PATH)/src -DHAVE_CONFIG_H -DFT_CONFIG_OPTION_USE_HARFBUZZ
+@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 =
noinst_PROGRAMS = showfont$(EXEEXT) glfont$(EXEEXT)
subdir = .