RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x' 

Conflicts:
	pandatool/src/assimp/pandaLogger.h
This commit is contained in:
rdb 2015-12-03 16:14:07 +01:00
parent d4eccee359 2680680df0
commit 956097b632
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makepanda/makepandacore.py
View File

@ -1553,7 +1553,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))

8
pandatool/src/assimp/pandaLogger.h
View File

@ -29,8 +29,12 @@ public:
static void set_default();
protected:
INLINE bool attachStream(Assimp::LogStream*, unsigned int) {};
INLINE bool detatchStream(Assimp::LogStream*, unsigned int) {}; // sic
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);