From 946c1e986d3590725bb2fb1b51c1a9d019ba96b8 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 28 Nov 2015 15:51:51 +0100 Subject: [PATCH 1/2] Fix Assimp compile warning --- pandatool/src/assimp/pandaLogger.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandatool/src/assimp/pandaLogger.h b/pandatool/src/assimp/pandaLogger.h index 5930ef1248..8996d6dbe5 100644 --- a/pandatool/src/assimp/pandaLogger.h +++ b/pandatool/src/assimp/pandaLogger.h @@ -29,8 +29,12 @@ public: static void set_default(); protected: - INLINE bool attachStream(Assimp::LogStream*, unsigned int) {}; - INLINE bool detatchStream(Assimp::LogStream*, unsigned int) {}; + INLINE bool attachStream(Assimp::LogStream*, unsigned int) { + return false; + }; + INLINE bool detatchStream(Assimp::LogStream*, unsigned int) { + return false; + }; void OnDebug(const char *message); void OnError(const char *message); From 2680680df0639bd7930d8ef96a3c056aef79780e Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 3 Dec 2015 16:09:54 +0100 Subject: [PATCH 2/2] Fix when passing custom incdir/libdir for Eigen --- makepanda/makepandacore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 95af98b493..57be97cbb7 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1552,7 +1552,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None, if (have_all_pkgs): return - if pkgconfig is not None and not libs: + if not custom_loc and pkgconfig is not None and not libs: # pkg-config is all we can do, abort if it wasn't found. if pkg in PkgListGet(): print("%sWARNING:%s Could not locate pkg-config package %s, excluding from build" % (GetColor("red"), GetColor(), pkgconfig))