From fc801b85684691ca0bb4971223773674227930d1 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 4 May 2011 15:55:46 +0000 Subject: [PATCH] add assimp library to ppremake --- dtool/Config.pp | 6 ++++++ dtool/LocalSetup.pp | 5 +++++ dtool/Package.pp | 5 +++++ dtool/pptempl/Global.pp | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/dtool/Config.pp b/dtool/Config.pp index b1db9d0d89..3183cda326 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -1065,6 +1065,12 @@ #define COLLADA15DOM_LIBS collada15dom xml2 boost_filesystem #defer HAVE_COLLADA15DOM $[libtest $[COLLADA15DOM_LPATH],$[COLLADA15DOM_LIBS]] +// The Assimp library loads various model formats. +#define ASSIMP_IPATH /usr/local/include/assimp +#define ASSIMP_LPATH /usr/local/lib +#define ASSIMP_LIBS assimp +#define HAVE_ASSIMP $[libtest $[ASSIMP_LPATH],$[ASSIMP_LIBS]] + // Also for the ARToolKit library, for augmented reality #define ARTOOLKIT_IPATH #define ARTOOLKIT_LPATH diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 48cfaabf94..35bd0a4705 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -210,6 +210,11 @@ #else #print - Did not find COLLADA DOM #endif +#if $[HAVE_ASSIMP] +#print + Assimp +#else +#print - Did not find Assimp +#endif #if $[HAVE_ARTOOLKIT] #print + ARToolKit #else diff --git a/dtool/Package.pp b/dtool/Package.pp index c5929a84bb..0c8112c420 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -369,6 +369,11 @@ #set COLLADA15DOM_LIBS $[COLLADA15DOM_LIBS] #set HAVE_COLLADA15DOM $[HAVE_COLLADA15DOM] +#set ASSIMP_IPATH $[unixfilename $[ASSIMP_IPATH]] +#set ASSIMP_LPATH $[unixfilename $[ASSIMP_LPATH]] +#set ASSIMP_LIBS $[ASSIMP_LIBS] +#set HAVE_ASSIMP $[HAVE_ASSIMP] + #set ARTOOLKIT_IPATH $[unixfilename $[ARTOOLKIT_IPATH]] #set ARTOOLKIT_LPATH $[unixfilename $[ARTOOLKIT_LPATH]] #set ARTOOLKIT_LIBS $[ARTOOLKIT_LIBS] diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index 1486a6e051..5e4bee08ff 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -491,6 +491,12 @@ #define collada15dom_libs $[COLLADA15DOM_LIBS] #endif +#if $[HAVE_ASSIMP] + #define assimp_ipath $[wildcard $[ASSIMP_IPATH]] + #define assimp_lpath $[wildcard $[ASSIMP_LPATH]] + #define assimp_libs $[ASSIMP_LIBS] +#endif + #if $[HAVE_ARTOOLKIT] #define artoolkit_ipath $[wildcard $[ARTOOLKIT_IPATH]] #define artoolkit_lpath $[wildcard $[ARTOOLKIT_LPATH]]