From c7b77fb6f09c94d5559f26cf166fa61b581cb626 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 15 Nov 2009 08:39:50 +0000 Subject: [PATCH] Automatically locate potentially conflicting ppremake and makepanda libraries on the library path, and warn if it finds them --- makepanda/makepanda.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 8273d6b122..5c2fb475d9 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1384,6 +1384,10 @@ def WriteConfigSettings(): WriteConfigSettings() MoveAwayConflictingFiles() +if "libdtoolbase" in GetLibCache(): + print "%sWARNING:%s Found conflicting Panda3D libraries from other ppremake build!" % (GetColor("red"), GetColor()) +if "libp3dtoolconfig" in GetLibCache(): + print "%sWARNING:%s Found conflicting Panda3D libraries from other makepanda build!" % (GetColor("red"), GetColor()) ########################################################################################## #