From 356b604627edc333c766d8cfb92b2cf58c579864 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 20 Nov 2018 14:50:40 +0100 Subject: [PATCH] makepanda: link with IrrXML when using static assimp library Same fix as #432 but for Linux --- makepanda/makepanda.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index c29fe10389..c6a01e7cd5 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -872,6 +872,13 @@ if (COMPILER=="GCC"): else: PkgDisable("OPENCV") + if not PkgSkip("ASSIMP") and \ + os.path.isfile(GetThirdpartyDir() + "assimp/lib/libassimp.a"): + # Also pick up IrrXML, which is needed when linking statically. + irrxml = GetThirdpartyDir() + "assimp/lib/libIrrXML.a" + if os.path.isfile(irrxml): + LibName("ASSIMP", irrxml) + rocket_libs = ("RocketCore", "RocketControls") if (GetOptimize() <= 3): rocket_libs += ("RocketDebugger",)