Browse Source

build on Irix

David Rose 20 years ago
parent
commit
86ce5ebba1

+ 1 - 1
panda/src/display/graphicsStateGuardian.I

@@ -47,7 +47,7 @@ ClipPlaneInfo() {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE void GraphicsStateGuardian::
 INLINE void GraphicsStateGuardian::
 release_all() {
 release_all() {
-  return _prepared_objects->release_all();
+  _prepared_objects->release_all();
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////

+ 1 - 0
panda/src/egg2pg/eggLoader.h

@@ -28,6 +28,7 @@
 #include "eggGroup.h"
 #include "eggGroup.h"
 #include "eggMaterial.h"
 #include "eggMaterial.h"
 #include "pt_EggMaterial.h"
 #include "pt_EggMaterial.h"
+#include "eggVertexPool.h"
 #include "texture.h"
 #include "texture.h"
 #include "pandaNode.h"
 #include "pandaNode.h"
 #include "pointerTo.h"
 #include "pointerTo.h"

+ 3 - 2
panda/src/particlesystem/colorInterpolationManager.I

@@ -270,10 +270,11 @@ get_segment(const int seg_id) {
 INLINE string ColorInterpolationManager::
 INLINE string ColorInterpolationManager::
 get_segment_id_list(void) {
 get_segment_id_list(void) {
   pvector<PT(ColorInterpolationSegment)>::iterator iter;
   pvector<PT(ColorInterpolationSegment)>::iterator iter;
-  stringstream output;
+  ostringstream output;
 
 
   for(iter = _i_segs.begin();iter != _i_segs.end();++iter)
   for(iter = _i_segs.begin();iter != _i_segs.end();++iter)
     output << (*iter)->get_id() << " ";
     output << (*iter)->get_id() << " ";
 
 
-  return output.str().substr(0,output.str().length()-1);
+  string str = output.str();
+  return str.substr(0, str.length()-1);
 }
 }

+ 1 - 0
panda/src/pgui/pgItem.h

@@ -28,6 +28,7 @@
 #include "nodePath.h"
 #include "nodePath.h"
 #include "luse.h"
 #include "luse.h"
 #include "pointerTo.h"
 #include "pointerTo.h"
+#include "audioSound.h"
 #include "textNode.h"
 #include "textNode.h"
 
 
 #include "pmap.h"
 #include "pmap.h"