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

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

Revision: 391
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=391&view=rev
Author:   andy_miller
Date:     2007-09-23 00:22:47 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
More Linux fixes - plib and opcode

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/code_generators/opcode/generate_code.py
    trunk/python-ogre/code_generators/plib/generate_code.py
    trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-09-23 03:40:15 UTC (rev 390)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-09-23 07:22:47 UTC (rev 391)
@@ -34,11 +34,11 @@
 PATH_OIS =          os.path.join(BASE_DIR, 'ois-1.0RC1')
 PATH_Newton =       os.path.join(BASE_DIR, 'newtonSDK','sdk')
 PATH_ODE =          os.path.join(BASE_DIR, 'ode-0.8')
-PATH_OGG =          os.path.join(BASE_DIR, 'ogg')
-PATH_VORBIS=        os.path.join(BASE_DIR, 'vorbis')
-PATH_OPENAL=        os.path.join(BASE_DIR, 'openal')
-PATH_ALUT=          os.path.join(BASE_DIR, 'freealut')
-PATH_OgreOde=       os.path.join(BASE_DIR, 'OgreAddons','ogreode')
+PATH_OGG =          os.path.join(BASE_DIR, 'libogg-1.1.3')
+PATH_VORBIS=        os.path.join(BASE_DIR, 'libvorbis-1.2.0')
+PATH_OPENAL=        os.path.join(BASE_DIR, 'openal-0.0.8')
+PATH_ALUT=          os.path.join(BASE_DIR, 'freealut-1.1.0')
+PATH_OgreOde=       os.path.join(PATH_OgreAddons,'ogreode')
 PATH_OGREAL=        os.path.join(PATH_THIRDPARTY,'ogreal')
 PATH_OPCODE=        os.path.join(PATH_THIRDPARTY,'opcode')
 PATH_quickgui=      os.path.join(PATH_THIRDPARTY,'quickgui')
@@ -94,10 +94,10 @@
 PATH_INCLUDE_ODESOURCE =    '' #      os.path.join( PATH_ODE, 'ode/src')
 PATH_INCLUDE_quickgui =     PATH_quickgui
 PATH_INCLUDE_OgreAL =       PATH_OGREAL
-PATH_INCLUDE_OPENAL =       os.path.join( PATH_OPENAL, 'include')
-PATH_INCLUDE_OGG=           os.path.join( PATH_OGG, 'include' )
-PATH_INCLUDE_VORBIS=        os.path.join( PATH_VORBIS, 'include' )
-PATH_INCLUDE_ALUT=          os.path.join( PATH_ALUT, 'include' )
+PATH_INCLUDE_OPENAL =       os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_OPENAL, 'include')
+PATH_INCLUDE_OGG=           os.path.join( LOCAL_INCLUDE,'ogg' ) #os.path.join( PATH_OGG, 'include' )
+PATH_INCLUDE_VORBIS=        os.path.join( LOCAL_INCLUDE,'vorbis' ) #os.path.join( PATH_VORBIS, 'include' )
+PATH_INCLUDE_ALUT=          os.path.join( LOCAL_INCLUDE ) #os.path.join( PATH_ALUT, 'include' )
 PATH_INCLUDE_OgreOde =      os.path.join( PATH_OgreOde,'include')
 PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
 PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')

Modified: trunk/python-ogre/code_generators/opcode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opcode/generate_code.py	2007-09-23 03:40:15 UTC (rev 390)
+++ trunk/python-ogre/code_generators/opcode/generate_code.py	2007-09-23 07:22:47 UTC (rev 391)
@@ -474,7 +474,7 @@
                         os.path.join( environment.opcode.root_dir, "python_opcode.h" )
                         , environment.opcode.cache_file )
 
-    defined_symbols = ['OPCODE_EXPORTS', 'ICE_NO_DLL'] #, 'OPC_USE_CALLBACKS' ]
+    defined_symbols = ['OPCODE_EXPORTS'] #, 'ICE_NO_DLL'] #, 'OPC_USE_CALLBACKS' ]
     defined_symbols.append( 'VERSION_' + environment.opcode.version )  
     
     #

Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py	2007-09-23 03:40:15 UTC (rev 390)
+++ trunk/python-ogre/code_generators/plib/generate_code.py	2007-09-23 07:22:47 UTC (rev 391)
@@ -41,7 +41,7 @@
     docs = "Python-Ogre Modified Function Call\\n" + general +"\\n"
     docs = docs + "Input: " + i + "\\n"
     docs = docs + "Output: " + o + "\\n\\\n"
-    return docs
+    return '"'+docs+'"'
 
 ############################################################
 ##
@@ -528,7 +528,7 @@
     #
     ##########################################################################################
     extractor = exdoc.doc_extractor("") # I'm excluding the UTFstring docs as lots about nothing 
-    mb.build_code_creator (module_name='_plib_' , doc_extractor= extractor )
+    mb.build_code_creator (module_name='_plib_' ) ## no docs as issues here, doc_extractor= extractor )
     
     for inc in environment.plib.include_dirs:
         mb.code_creator.user_defined_directories.append(inc )

Modified: trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/plib/hand_made_wrappers.py	2007-09-23 03:40:15 UTC (rev 390)
+++ trunk/python-ogre/code_generators/plib/hand_made_wrappers.py	2007-09-23 07:22:47 UTC (rev 391)
@@ -7,9 +7,9 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte [size];
+    unsigned char * buffer = new unsigned char [size];
     for (index=0;index<size;index++ ) {
-        buffer[index] = (byte) boost::python::extract<int> (listin[index]);
+        buffer[index] = (unsigned char) boost::python::extract<int> (listin[index]);
     }
     result = me.send((const void *) buffer, size, flags );
     delete buffer;
@@ -20,9 +20,9 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte[size];
+    unsigned char * buffer = new unsigned char[size];
     for (index=0;index<size;index++ ) {
-        buffer[index] = (byte) boost::python::extract<char> (listin[index]);
+        buffer[index] = (unsigned char) boost::python::extract<char> (listin[index]);
     }
     result = me.send((const void *) buffer, size, flags );
     delete buffer;
@@ -32,7 +32,7 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte[size];
+    unsigned char * buffer = new unsigned char[size];
     for (index=0;index<size;index++ ) {
         buffer[index] = boost::python::extract<int> (listin[index]);
     }
@@ -44,7 +44,7 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte[size];
+    unsigned char * buffer = new unsigned char[size];
     for (index=0;index<size;index++ ) {
         buffer[index] = boost::python::extract<char> (listin[index]);
     }
@@ -56,7 +56,7 @@
  
 boost::python::list netSocket_recv	( netSocket & me, int MaxSize=20486, int flags = 0 )
 {
-    byte * buffer = new byte [MaxSize];
+    unsigned char * buffer = new unsigned char [MaxSize];
     int length,x;
     boost::python::list listout;
     length = me.recv ( (void *) buffer, MaxSize, flags);
@@ -82,7 +82,7 @@
 
 boost::python::list netSocket_recvfrom ( netSocket & me, int MaxSize, int flags, netAddress* from ) 
 {
-    byte * buffer = new byte [MaxSize];
+    unsigned char * buffer = new unsigned char [MaxSize];
     int length,x;
     boost::python::list listout;
     length = me.recvfrom ( (void *) buffer, MaxSize, flags, from);
@@ -162,9 +162,9 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte [size];
+    unsigned char * buffer = new unsigned char [size];
     for (index=0;index<size;index++ ) {
-        buffer[index] = (byte) boost::python::extract<int> (listin[index]);
+        buffer[index] = (unsigned char) boost::python::extract<int> (listin[index]);
     }
     result = me.send((const void *) buffer, size, flags );
     delete buffer;
@@ -175,9 +175,9 @@
 {
     int index, result;
     int size = len(listin);
-    byte * buffer = new byte[size];
+    unsigned char * buffer = new unsigned char[size];
     for (index=0;index<size;index++ ) {
-        buffer[index] = (byte) boost::python::extract<char> (listin[index]);
+        buffer[index] = (unsigned char) boost::python::extract<char> (listin[index]);
     }
     result = me.send((const void *) buffer, size, flags );
     delete buffer;
@@ -185,7 +185,7 @@
 }  
 boost::python::list netChannel_recv	( netChannel & me, int MaxSize=2048, int flags = 0 )
 {
-    byte * buffer = new byte [MaxSize];
+    unsigned char * buffer = new unsigned char [MaxSize];
     int length,x;
     boost::python::list listout;
     length = me.recv ( (void *) buffer, MaxSize, flags);
@@ -301,4 +301,4 @@
     rt = mb.class_( 'netBuffer' )
     rt.add_declaration_code( WRAPPER_DEFINITION_netBuffer )
     apply_reg (rt,  WRAPPER_REGISTRATION_netBuffer )
-        
\ No newline at end of file
+        

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2007-09-23 03:40:15 UTC (rev 390)
+++ trunk/python-ogre/environment.py	2007-09-23 07:22:47 UTC (rev 391)
@@ -317,7 +317,9 @@
     lib_dirs = [ Config.PATH_LIB_Boost
                 ]
     include_dirs = [ Config.PATH_Boost 
-                    ,  Config.PATH_INCLUDE_OPCODE
+                    ,  Config.PATH_INCLUDE_OPCODE
+                    ,  os.path.join(Config.PATH_INCLUDE_OPCODE, 'Ice' )
+
                     ]
     CCFLAGS =  ' -DBAN_OPCODE_AUTOLINK -DICE_NO_DLL '
     ModuleName = 'Opcode'


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