2
0
Эх сурвалжийг харах

Merge pull request #79105 from akien-mga/linux-libsquish-lacks-pkgconfig

Linux: Link libsquish directly when unbundling, .pc file unreliable
Rémi Verschelde 2 жил өмнө
parent
commit
79b31a8357

+ 2 - 1
platform/linuxbsd/detect.py

@@ -235,7 +235,8 @@ def configure(env: "Environment"):
         env.ParseConfig("pkg-config libenet --cflags --libs")
         env.ParseConfig("pkg-config libenet --cflags --libs")
 
 
     if not env["builtin_squish"]:
     if not env["builtin_squish"]:
-        env.ParseConfig("pkg-config libsquish --cflags --libs")
+        # libsquish doesn't reliably install its .pc file, so some distros lack it.
+        env.Append(LIBS=["libsquish"])
 
 
     if not env["builtin_zstd"]:
     if not env["builtin_zstd"]:
         env.ParseConfig("pkg-config libzstd --cflags --libs")
         env.ParseConfig("pkg-config libzstd --cflags --libs")