Skip to content

Commit 356b604

Browse files
committed
makepanda: link with IrrXML when using static assimp library
Same fix as panda3d#432 but for Linux
1 parent 02979fa commit 356b604

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

makepanda/makepanda.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,13 @@ def parseopts(args):
872872
else:
873873
PkgDisable("OPENCV")
874874

875+
if not PkgSkip("ASSIMP") and \
876+
os.path.isfile(GetThirdpartyDir() + "assimp/lib/libassimp.a"):
877+
# Also pick up IrrXML, which is needed when linking statically.
878+
irrxml = GetThirdpartyDir() + "assimp/lib/libIrrXML.a"
879+
if os.path.isfile(irrxml):
880+
LibName("ASSIMP", irrxml)
881+
875882
rocket_libs = ("RocketCore", "RocketControls")
876883
if (GetOptimize() <= 3):
877884
rocket_libs += ("RocketDebugger",)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy