From 3e461e03ae096fe2c4a4706dc4f51392b5e66164 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 26 Jan 2005 11:37:13 +0000 Subject: [PATCH] support Irix build (without HAVE_IOSTREAM) --- pandatool/src/mayaprogs/Sources.pp | 4 ++++ pandatool/src/mayaprogs/mayaSavePview.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandatool/src/mayaprogs/Sources.pp b/pandatool/src/mayaprogs/Sources.pp index dd9cd6d5f0..9c4b306f33 100644 --- a/pandatool/src/mayaprogs/Sources.pp +++ b/pandatool/src/mayaprogs/Sources.pp @@ -104,6 +104,10 @@ #define USE_PACKAGES maya #define TARGET mayasavepview + // Since mayasavepview doesn't include pandatoolbase.h, we have to + // pass in HAVE_IOSTREAM on the command line. + #define EXTRA_CDEFS $[EXTRA_CDEFS] $[if $[HAVE_IOSTREAM],HAVE_IOSTREAM] + #if $[WINDOWS_PLATFORM] #define dlllib mll #endif diff --git a/pandatool/src/mayaprogs/mayaSavePview.h b/pandatool/src/mayaprogs/mayaSavePview.h index f309190306..a5f98be498 100644 --- a/pandatool/src/mayaprogs/mayaSavePview.h +++ b/pandatool/src/mayaprogs/mayaSavePview.h @@ -29,9 +29,11 @@ #define _BOOL 1 #endif +#ifdef HAVE_IOSTREAM // This will ask Maya 5.0 or better to use the new library // instead of the old library. -#define REQUIRE_IOSTREAM 1 +#define REQUIRE_IOSTREAM +#endif // HAVE_IOSTREAM #include #include