TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepanda: link with IrrXML when using static assimp library

Browse Source 
Same fix as #432 but for Linux
This commit is contained in:
rdb 2018-11-20 14:50:40 +01:00
parent 02979fa106
commit 356b604627
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

@ -872,6 +872,13 @@ if (COMPILER=="GCC"):
else: else:
PkgDisable("OPENCV") 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") rocket_libs = ("RocketCore", "RocketControls")
if (GetOptimize() <= 3): if (GetOptimize() <= 3):
rocket_libs += ("RocketDebugger",) rocket_libs += ("RocketDebugger",)