From b8f6d5b6af4ed92bf172e5c22f9ed82a69738a4a Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Thu, 24 Feb 2022 20:00:11 +0300
Subject: [PATCH] configure: add missing harfbuzz libs to PC_LIBS for windows
builds.
Fixes: https://github.com/libsdl-org/SDL_ttf/issues/182
---
configure | 7 +++++--
configure.ac | 5 +++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index bfec2c5..b1b0fce 100755
--- a/configure
+++ b/configure
@@ -18291,6 +18291,7 @@ _ACEOF
CFLAGS="$CFLAGS -static-libgcc"
# for uniscribe support:
TTF_LIBS="$TTF_LIBS -lusp10 -lgdi32 -lrpcrt4"
+ PC_LIBS="$PC_LIBS -lusp10 -lgdi32 -lrpcrt4"
;;
esac
case "$host" in
@@ -18300,8 +18301,10 @@ _ACEOF
fi
;;
esac
- CXXFLAGS="$CXXFLAGS -Wno-unused-result"
- CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -fno-threadsafe-statics"
+ # silence a lot of harfbuzz warnings:
+ CXXFLAGS="$CXXFLAGS -Wno-unused-result"
+ # prevent linking to libstdc++ :
+ CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -fno-threadsafe-statics"
else
SUMMARY="${SUMMARY}Using included HarfBuzz : NO\n"
diff --git a/configure.ac b/configure.ac
index d5c6fdc..4e355d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,7 @@ if test x$enable_harfbuzz = xyes; then
CFLAGS="$CFLAGS -static-libgcc"
# for uniscribe support:
TTF_LIBS="$TTF_LIBS -lusp10 -lgdi32 -lrpcrt4"
+ PC_LIBS="$PC_LIBS -lusp10 -lgdi32 -lrpcrt4"
;;
esac
case "$host" in
@@ -221,9 +222,9 @@ if test x$enable_harfbuzz = xyes; then
fi
;;
esac
- dnl silence a lot of harfbuzz warnings:
+ # silence a lot of harfbuzz warnings:
CXXFLAGS="$CXXFLAGS -Wno-unused-result"
- dnl prevent linking to libstdc++:
+ # prevent linking to libstdc++ :
CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions -fno-threadsafe-statics"
else
SUMMARY="${SUMMARY}Using included HarfBuzz : NO\n"