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

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

Revision: 487
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=487&view=rev
Author:   andy_miller
Date:     2007-12-03 19:39:50 -0800 (Mon, 03 Dec 2007)

Log Message:
-----------
Linux fixes:
	typo in case
	unsigned to unsigned int for new gxxcml 
	#if platform is linux for include header
support

Modified Paths:
--------------
    trunk/python-ogre/code_generators/ogre/customization_data.py
    trunk/python-ogre/code_generators/ogre/generate_code.py
    trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h

Modified: trunk/python-ogre/code_generators/ogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/customization_data.py	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/customization_data.py	2007-12-04 03:39:50 UTC (rev 487)
@@ -2,7 +2,7 @@
 def header_files( version ):
     if not version.startswith("1.2"):
         ## 21Nov07; Change to precompiled header support
-        return [ 'Python_ogre_precompiled.h'
+        return [ 'python_ogre_precompiled.h'
 # #                  ,'boost/python.hpp'
 # #                  ,'python_ogre_masterlist.h'
 # #                  ,'boost/python/ssize_t.hpp' ## needed for python2.4 as it doesn't define ssize_t

Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py	2007-12-04 03:39:50 UTC (rev 487)
@@ -680,7 +680,10 @@
     elif sys.platform.startswith ('linux'):
         pass
     mb.global_ns.class_('vector<int, std::allocator<int> >').alias='VectorInt'
-    mb.global_ns.class_('vector<std::pair<unsigned, unsigned>, std::allocator<std::pair<unsigned, unsigned> > >').alias='VectorUnsignedUnsigned'
+    try:
+        mb.global_ns.class_('vector<std::pair<unsigned int, unsigned int>, std::allocator<std::pair<unsigned int, unsigned int> > >').alias='VectorUnsignedUnsigned'
+    except:
+        pass
     #as reported by mike with linux:bp::arg("flags")=(std::_Ios_Fmtflags)0
     mb.namespace( MAIN_NAMESPACE ).class_('StringConverter').member_functions('toString').exclude()    
 
@@ -983,7 +986,8 @@
     ## copied to the generaated directory..
     additional_files=[
             os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h'),
-            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
+            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_precompiled.h' ),
+            os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'python_ogre_masterlist.h' ),
             os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'generators.h' ),
             os.path.join( os.path.abspath(os.path.dirname(__file__) ), 'custom_rvalue.cpp' ),
             os.path.join( environment.include_dir, 'tuples.hpp' )

Modified: trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2007-12-04 02:36:50 UTC (rev 486)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h	2007-12-04 03:39:50 UTC (rev 487)
@@ -6,11 +6,14 @@
 sizeof ( Ogre::MapIterator< std::multimap<Ogre::String, Ogre::String> > );
 sizeof ( Ogre::MapIterator< std::map<Ogre::String, std::multimap<Ogre::String, Ogre::String>*> > );
 
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::Node*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::Node*> >, false> > );
 //sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, unsigned short, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, unsigned short> >, false> > );
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::SharedPtr<Ogre::Resource>, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::SharedPtr<Ogre::Resource> > >, false> > );
-sizeof( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
 sizeof( stdext::_Hash<stdext::_Hmap_traits<std::string, Ogre::MovableObject*, stdext::hash_compare<std::string, std::less<std::string> >, std::allocator<std::pair<std::string const, Ogre::MovableObject*> >, false> > );
+#endif
+
+sizeof ( std::pair<Ogre::SharedPtr<Ogre::Resource>, bool> );
 
 std::vector< int > v;
 std::set< std::string > s;


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