From: Travis Wrightsman <travis@wrightsman.org>
Date: Thu, 12 Dec 2024 23:48:58 +0000 (-0800)
Subject: Fix wslay and recast compiler flags
X-Git-Tag: archive/raspbian/3.6+ds-2+rpi1^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a07bd1121aa03764d2af578ebc2d442ba21a53f;p=godot.git

Fix wslay and recast compiler flags


Gbp-Pq: Name Fix-wslay-and-recast-compiler-flags.patch
---

diff --git a/platform/server/detect.py b/platform/server/detect.py
index 7bd5a0fd..419e81c4 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -259,8 +259,14 @@ def configure(env):
         # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
         env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
 
+    if not env["builtin_recast"]:
+        env.Append(LIBS=["Recast"])
+        env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
+
     if not env["builtin_wslay"]:
-        env.ParseConfig("pkg-config libwslay --cflags --libs")
+        # wslay in Debian does not have a pkg-config configuration
+        env.Prepend(CPPPATH=["/usr/include/wslay"])
+        env.Append(LIBS=["wslay"])
 
     if not env["builtin_miniupnpc"]:
         # No pkgconfig file so far, hardcode default paths.
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 6390c263..fd9d90c2 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -344,8 +344,14 @@ def configure(env):
         # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
         env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
 
+    if not env["builtin_recast"]:
+        env.Append(LIBS=["Recast"])
+        env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
+
     if not env["builtin_wslay"]:
-        env.ParseConfig("pkg-config libwslay --cflags --libs")
+        # wslay in Debian does not have a pkg-config configuration
+        env.Prepend(CPPPATH=["/usr/include/wslay"])
+        env.Append(LIBS=["wslay"])
 
     if not env["builtin_miniupnpc"]:
         # No pkgconfig file so far, hardcode default paths.