TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: specify freetype library after harfbuzz as well

Browse Source 
This fixes static linking of harfbuzz and freetype, which have a circular dependency on each other.
This commit is contained in:
rdb 2019-11-17 20:37:33 +01:00
parent 92476a3788
commit 1cfd297433
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
makepanda/makepanda.py
View File

@ -948,6 +948,13 @@ if (COMPILER=="GCC"):
SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h") SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h")
SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config") SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config")
# Copy freetype libraries to be specified after harfbuzz libraries as well,
# because there's a circular dependency between the two libraries.
if not PkgSkip("FREETYPE") and not PkgSkip("HARFBUZZ"):
for (opt, name) in LIBNAMES:
if opt == "FREETYPE":
LibName("HARFBUZZ", name)
if not PkgSkip("FFMPEG"): if not PkgSkip("FFMPEG"):
if GetTarget() == "darwin": if GetTarget() == "darwin":
LibName("FFMPEG", "-Wl,-read_only_relocs,suppress") LibName("FFMPEG", "-Wl,-read_only_relocs,suppress")