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

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

Revision: 857
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=857&view=rev
Author:   andy_miller
Date:     2009-01-28 00:36:40 +0000 (Wed, 28 Jan 2009)

Log Message:
-----------
Further Mac updates - 4 more modules now building (et, noise, cadunetree, caelum)

Modified Paths:
--------------
    trunk/python-ogre/SConstruct
    trunk/python-ogre/code_generators/cadunetree/customization_data.py
    trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
    trunk/python-ogre/code_generators/caelum/customization_data.py
    trunk/python-ogre/code_generators/caelum/python_caelum.h
    trunk/python-ogre/code_generators/et/customization_data.py
    trunk/python-ogre/code_generators/et/python_et.h
    trunk/python-ogre/code_generators/hydrax/customization_data.py
    trunk/python-ogre/code_generators/hydrax/python_hydrax.h
    trunk/python-ogre/code_generators/noise/customization_data.py
    trunk/python-ogre/code_generators/noise/python_noise.h

Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/SConstruct	2009-01-28 00:36:40 UTC (rev 857)
@@ -68,6 +68,7 @@
         else:
             CCFLAGS = ' -I./ -O3 -dynamic -fPIC -DBOOST_PYTHON_NO_PY_SIGNATURES -DBOOST_PYTHON_MAX_ARITY=19   '
             CCFLAGS += ' -ftemplate-depth-128 -finline-functions -Wno-inline -Wall -no-cpp-precomp -gdwarf-2 -DNDEBUG '
+            CCFLAGS += ' -include strings.h -include Carbon/Carbon.h '
             # -ftemplate-depth-128 -D_POSIX_C_SOURCE -no-cpp-precomp -gdwarf-2 -finline-functions -Wno-inline -Wall -DBOOST_ALL_NO_LIB=1 -DBOOST_PYTHON_SOURCE 
             # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/
             # -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/             CCFLAGS  = ' -I -pipe -O3 -I./'

Modified: trunk/python-ogre/code_generators/cadunetree/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/customization_data.py	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/customization_data.py	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
 def header_files( version ):
-    return [ 'CaduneTree.h']
-  
+    ret= [ 'CaduneTree.h']
+    if os.sys.platform == 'darwin':
+        ret.insert(0,'Carbon/Carbon.h')
+    return ret  
 def huge_classes( version ):
     return []
    
\ No newline at end of file

Modified: trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h
===================================================================
--- trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/cadunetree/python_cadunetree.h	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "CTParameters.h"
 #include "CTSerializer.h"
 //#include "CTSection.h"

Modified: trunk/python-ogre/code_generators/caelum/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/caelum/customization_data.py	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/customization_data.py	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,7 +1,9 @@
-
+import os
 def header_files( version ):
-    return [ 'Caelum.h']
-  
+    ret = [ 'Caelum.h']
+    if os.sys.platform == 'darwin':
+        ret.insert(0,'Carbon/Carbon.h')
+    return ret  
 def huge_classes( version ):
     return []
    

Modified: trunk/python-ogre/code_generators/caelum/python_caelum.h
===================================================================
--- trunk/python-ogre/code_generators/caelum/python_caelum.h	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/caelum/python_caelum.h	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "Caelum.h"
 
 // First we create a magic namespace to hold all our aliases

Modified: trunk/python-ogre/code_generators/et/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/et/customization_data.py	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/customization_data.py	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,13 +1,16 @@
-
+import os
 def header_files( version ):
-    return ['ETTerrainInfo.h',
+    ret = ['ETTerrainInfo.h',
             'ETTerrainManager.h',
             'ETBrush.h',
             'ETSplattingManager.h',
             'Ogre.h',
             'OgreColourValue.h',
             'OgreImage.h'
-]
+            ]
+    if os.sys.platform == 'darwin':
+        ret.insert(0,'Carbon/Carbon.h')
+    return ret
 ##,
 ##            'OgreColourValue.h'  
 def huge_classes( version ):

Modified: trunk/python-ogre/code_generators/et/python_et.h
===================================================================
--- trunk/python-ogre/code_generators/et/python_et.h	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/et/python_et.h	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,3 +1,7 @@
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 
 #include "ETTerrainInfo.h"
 #include "ETTerrainManager.h"

Modified: trunk/python-ogre/code_generators/hydrax/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/hydrax/customization_data.py	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/customization_data.py	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,11 +1,13 @@
-
+import os
 def header_files( version ):
-    return [ 'Hydrax.h',
+    ret= [ 'Hydrax.h',
             "ProjectedGrid.h",
             "SimpleGrid.h",
             "Perlin.h"
         ]
-  
+    if os.sys.platform == 'darwin':
+        ret.insert(0,'Carbon/Carbon.h')
+    return ret  
 def huge_classes( version ):
     return []
    
\ No newline at end of file

Modified: trunk/python-ogre/code_generators/hydrax/python_hydrax.h
===================================================================
--- trunk/python-ogre/code_generators/hydrax/python_hydrax.h	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/hydrax/python_hydrax.h	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "Hydrax.h"
 #include "ProjectedGrid.h"
 #include "SimpleGrid.h"

Modified: trunk/python-ogre/code_generators/noise/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/noise/customization_data.py	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/customization_data.py	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,8 +1,10 @@
-
+import os
 def header_files( version ):
-    return [ 'noise.h',
+    ret= [ 'noise.h',
              'noiseutils.h']
-  
+    if os.sys.platform == 'darwin':
+        ret.insert(0,'Carbon/Carbon.h')
+    return ret  
 def huge_classes( version ):
     return []
    

Modified: trunk/python-ogre/code_generators/noise/python_noise.h
===================================================================
--- trunk/python-ogre/code_generators/noise/python_noise.h	2009-01-27 13:40:49 UTC (rev 856)
+++ trunk/python-ogre/code_generators/noise/python_noise.h	2009-01-28 00:36:40 UTC (rev 857)
@@ -1,4 +1,7 @@
-
+#if defined __APPLE_CC__
+    #include "strings.h"
+    #include "Carbon/Carbon.h"
+#endif
 #include "noise.h"
 #include "noiseutils.h"
 


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