[Python-ogre-commit] SF.net SVN: python-ogre:[861] trunk/python-ogre

[<and...@us...>]

Revision: 861
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=861&view=rev
Author:   andy_miller
Date:     2009-01-28 07:39:23 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Mac updates

Modified Paths:
--------------
    trunk/python-ogre/ThirdParty/noise/line.cpp
    trunk/python-ogre/code_generators/ogreal/python_ogreal.h
    trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h
    trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
    trunk/python-ogre/code_generators/ogreforests/python_forests.h
    trunk/python-ogre/code_generators/ogreode/python_ode.h
    trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
    trunk/python-ogre/code_generators/quickgui/python_quickgui.h
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/ThirdParty/noise/line.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/noise/line.cpp	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/ThirdParty/noise/line.cpp	2009-01-28 07:39:23 UTC (rev 861)
@@ -19,9 +19,10 @@
 
 #include "line.h"
 
-using namespace noise;
-using namespace noise::model;
+namespace noise {
 
+namespace model {
+
 Line::Line ():
 
   m_attenuate (true),
@@ -63,3 +64,5 @@
     return value;
   }
 }
+
+} }  // namespaces
\ No newline at end of file

Modified: trunk/python-ogre/code_generators/ogreal/python_ogreal.h
===================================================================
--- trunk/python-ogre/code_generators/ogreal/python_ogreal.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreal/python_ogreal.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,6 +1,9 @@
 #ifndef __python_ogreal_h_5B402FBF_8DE8_49C9_AF71_1CF9634B5344__
 #define __python_ogreal_h_5B402FBF_8DE8_49C9_AF71_1CF9634B5344__
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 //See best practices section in Py++ documentation
 //#include "../ogre/python_ogre_masterlist.h"
 #include "OgreAL.h"

Modified: trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrebulletc/python_ogrebullet.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "OgreBulletCollisions.h"
 
 // First we create a magic namespace to hold all our aliases

Modified: trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h
===================================================================
--- trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrebulletd/python_ogrebullet.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "OgreBulletDynamics.h"
 #include "LinearMath/btStackAlloc.h"
 #include "LinearMath/btPoolAllocator.h"

Modified: trunk/python-ogre/code_generators/ogreforests/python_forests.h
===================================================================
--- trunk/python-ogre/code_generators/ogreforests/python_forests.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreforests/python_forests.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,4 +1,10 @@
 #include <string>
+
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
+
 #include "PagedGeometry.h"
 #include "GrassLoader.h"
 

Modified: trunk/python-ogre/code_generators/ogreode/python_ode.h
===================================================================
--- trunk/python-ogre/code_generators/ogreode/python_ode.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogreode/python_ode.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -6,7 +6,10 @@
 #include <vector>
 #include <string>
 #include <map>
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "ode/ode.h"
 #include "ode/common.h"
 #include "ode/odecpp.h"

Modified: trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h
===================================================================
--- trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/ogrepcz/python_ogrepcz.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "Ogre.h"
 #include "OgrePortal.h"
 #include "OgrePCZSceneNode.h"

Modified: trunk/python-ogre/code_generators/quickgui/python_quickgui.h
===================================================================
--- trunk/python-ogre/code_generators/quickgui/python_quickgui.h	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/code_generators/quickgui/python_quickgui.h	2009-01-28 07:39:23 UTC (rev 861)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "Ogre.h"  // need to include this
 #include "QuickGUIRoot.h"
 

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2009-01-28 07:02:42 UTC (rev 860)
+++ trunk/python-ogre/environment.py	2009-01-28 07:39:23 UTC (rev 861)
@@ -1722,7 +1722,7 @@
     descText = "Generate 'noise'"
 
 class watermesh:
-    active = True
+    active = False
     pythonModule = True
     version="1.0"
     parent="ogre/addons"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.