mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 19:08:55 -04:00
compile maya5.0
This commit is contained in:
parent
a4d32f8d14
commit
5b570da445
@ -19,6 +19,8 @@
|
|||||||
// This header file works in conjunction with pre_maya_include.h; it
|
// This header file works in conjunction with pre_maya_include.h; it
|
||||||
// cleans up some of the definitions that it left open.
|
// cleans up some of the definitions that it left open.
|
||||||
|
|
||||||
// Remove the symbols defined from pre_maya_include.h.
|
// This header is no longer necessary owing to the existence of
|
||||||
#undef ostream
|
// REQUIRE_IOSTREAM in Maya5.0. We'll keep it around for now in case
|
||||||
#undef istream
|
// we ever need it again.
|
||||||
|
|
||||||
|
|
||||||
|
@ -27,23 +27,10 @@
|
|||||||
#define _BOOL 1
|
#define _BOOL 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Maya tries to make a forward declaration for class ostream, but
|
|
||||||
// this is not necessarily a class! Curses. We can't use any of the
|
|
||||||
// built-in Maya stream operators, and we have to protect ourselves
|
|
||||||
// from them.
|
|
||||||
|
|
||||||
// In Maya 5.0, the headers seem to provide the manifest
|
// In Maya 5.0, the headers seem to provide the manifest
|
||||||
// REQUIRE_IOSTREAM, which forces it to use the new <iostream> headers
|
// REQUIRE_IOSTREAM, which forces it to use the new <iostream> headers
|
||||||
// instead of the old <iostream.h> headers. It also says this is for
|
// instead of the old <iostream.h> headers. It also says this is for
|
||||||
// Linux only.
|
// Linux only, but it seems to work just fine on Windows, obviating
|
||||||
#ifdef __GNUC__
|
// the need for sneaky #defines in this and in post_maya_include.h.
|
||||||
#ifndef PRE_MAYA_INCLUDE_H
|
|
||||||
#define PRE_MAYA_INCLUDE_H
|
|
||||||
#define REQUIRE_IOSTREAM
|
#define REQUIRE_IOSTREAM
|
||||||
#endif
|
|
||||||
#else // __GNUC__
|
|
||||||
|
|
||||||
#define ostream maya_ostream
|
|
||||||
#define istream maya_istream
|
|
||||||
|
|
||||||
#endif // __GNUC__
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user