Browse Source

makepanda: link with IrrXML when using static assimp library

Same fix as #432 but for Linux
rdb 7 years ago
parent
commit
356b604627
1 changed files with 7 additions and 0 deletions
  1. 7 0
      makepanda/makepanda.py

+ 7 - 0
makepanda/makepanda.py

@@ -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",)