[Python-ogre-commit] SF.net SVN: python-ogre: [399] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [399] trunk/python-ogre
|
From: <and...@us...> - 2007-09-29 06:46:27
|
Revision: 399
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=399&view=rev
Author: andy_miller
Date: 2007-09-28 23:46:30 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
OgreNewt now compiles under Linux
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/opcode/Ice/IceTypes.h
trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/02-ExtractAndPatch.sh
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
Modified: trunk/python-ogre/ThirdParty/opcode/Ice/IceTypes.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/Ice/IceTypes.h 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/ThirdParty/opcode/Ice/IceTypes.h 2007-09-29 06:46:30 UTC (rev 399)
@@ -63,8 +63,8 @@
typedef unsigned short uword; //!< sizeof(uword) must be 2
typedef signed int sdword; //!< sizeof(sdword) must be 4
typedef unsigned int udword; //!< sizeof(udword) must be 4
- typedef signed __int64 sqword; //!< sizeof(sqword) must be 8
- typedef unsigned __int64 uqword; //!< sizeof(uqword) must be 8
+ typedef signed long long sqword; //!< sizeof(sqword) must be 8
+ typedef unsigned long long uqword; //!< sizeof(uqword) must be 8
typedef float float32; //!< sizeof(float32) must be 4
typedef double float64; //!< sizeof(float64) must be 4
@@ -137,7 +137,7 @@
#define ONE_OVER_RAND_MAX (1.0f / float(RAND_MAX)) //!< Inverse of the max possible value returned by rand()
- typedef int (__stdcall* PROC)(); //!< A standard procedure call.
+ //typedef int (__stdcall* PROC)(); //!< A standard procedure call.
typedef bool (*ENUMERATION)(udword value, udword param, udword context); //!< ICE standard enumeration call
typedef void** VTABLE; //!< A V-Table.
Modified: trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h
===================================================================
--- trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/ThirdParty/opcode/OPC_IceHook.h 2007-09-29 06:46:30 UTC (rev 399)
@@ -18,7 +18,7 @@
#include <assert.h>
#include <string.h>
#include <float.h>
- #include <Math.h>
+ #include <math.h>
#ifndef ASSERT
#define ASSERT(exp) {}
@@ -29,42 +29,42 @@
#define SetIceError false
#define EC_OUTOFMEMORY "Out of memory"
- #include ".\Ice\IcePreprocessor.h"
+ #include "./Ice/IcePreprocessor.h"
#undef ICECORE_API
#define ICECORE_API OPCODE_API
- #include ".\Ice\IceTypes.h"
- #include ".\Ice\IceFPU.h"
- #include ".\Ice\IceMemoryMacros.h"
+ #include "./Ice/IceTypes.h"
+ #include "./Ice/IceFPU.h"
+ #include "./Ice/IceMemoryMacros.h"
namespace IceCore
{
- #include ".\Ice\IceUtils.h"
- #include ".\Ice\IceContainer.h"
- #include ".\Ice\IcePairs.h"
- #include ".\Ice\IceRevisitedRadix.h"
- #include ".\Ice\IceRandom.h"
+ #include "./Ice/IceUtils.h"
+ #include "./Ice/IceContainer.h"
+ #include "./Ice/IcePairs.h"
+ #include "./Ice/IceRevisitedRadix.h"
+ #include "./Ice/IceRandom.h"
}
using namespace IceCore;
#define ICEMATHS_API OPCODE_API
namespace IceMaths
{
- #include ".\Ice\IceAxes.h"
- #include ".\Ice\IcePoint.h"
- #include ".\Ice\IceHPoint.h"
- #include ".\Ice\IceMatrix3x3.h"
- #include ".\Ice\IceMatrix4x4.h"
- #include ".\Ice\IcePlane.h"
- #include ".\Ice\IceRay.h"
- #include ".\Ice\IceIndexedTriangle.h"
- #include ".\Ice\IceTriangle.h"
- #include ".\Ice\IceTriList.h"
- #include ".\Ice\IceAABB.h"
- #include ".\Ice\IceOBB.h"
- #include ".\Ice\IceBoundingSphere.h"
- #include ".\Ice\IceSegment.h"
- #include ".\Ice\IceLSS.h"
+ #include "./Ice/IceAxes.h"
+ #include "./Ice/IcePoint.h"
+ #include "./Ice/IceHPoint.h"
+ #include "./Ice/IceMatrix3x3.h"
+ #include "./Ice/IceMatrix4x4.h"
+ #include "./Ice/IcePlane.h"
+ #include "./Ice/IceRay.h"
+ #include "./Ice/IceIndexedTriangle.h"
+ #include "./Ice/IceTriangle.h"
+ #include "./Ice/IceTrilist.h"
+ #include "./Ice/IceAABB.h"
+ #include "./Ice/IceOBB.h"
+ #include "./Ice/IceBoundingSphere.h"
+ #include "./Ice/IceSegment.h"
+ #include "./Ice/IceLSS.h"
}
using namespace IceMaths;
Modified: trunk/python-ogre/code_generators/opcode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/opcode/generate_code.py 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/code_generators/opcode/generate_code.py 2007-09-29 06:46:30 UTC (rev 399)
@@ -40,9 +40,9 @@
## small helper function
def docit ( general, i, o ):
- docs = "Python-Ogre (Opcode) Modified Function Call\\n" + general +"\\n"
+ docs = "\"Python-Ogre (Opcode) Modified Function Call\\n" + general +"\\n"
docs = docs + "Input: " + i + "\\n"
- docs = docs + "Output: " + o + "\\n\\\n"
+ docs = docs + "Output: " + o + "\\n\\\n\""
return docs
############################################################
@@ -475,7 +475,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 )
#
@@ -578,7 +578,7 @@
#
##########################################################################################
extractor = exdoc.doc_extractor("") # I'm excluding the UTFstring docs as lots about nothing
- mb.build_code_creator (module_name='_opcode_' , doc_extractor= extractor )
+ mb.build_code_creator (module_name='_opcode_') ## , doc_extractor= extractor )
for inc in environment.opcode.include_dirs:
mb.code_creator.user_defined_directories.append(inc )
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/environment.py 2007-09-29 06:46:30 UTC (rev 399)
@@ -248,8 +248,11 @@
class ogrenewt:
active=True
version = "1.0"
- parent = "ogre/physics"
- libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+ parent = "ogre/physics"
+ if os.name=="nt":
+ libs = ['Newton', Config.LIB_Boost, 'OgreNewt_Main', 'OgreMain']
+ else:
+ libs = ['Newton', Config.LIB_Boost, 'OgreNewt', 'OgreMain']
include_dirs = [Config.PATH_Boost
, Config.PATH_Newton # only one path for Newton
, Config.PATH_INCLUDE_Ogre
Modified: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-09-29 06:46:30 UTC (rev 399)
@@ -59,7 +59,9 @@
#
# Install Newton
#
-echo " -- Installing Newton to OgreNewt and root"
+echo " -- Patching and Installing Newton "
+# patch to include stddef.h as size_t isn't defined in Newton.h
+patch -s -i ./python-ogre/patch/Newton.patch -p0
cp newtonSDK/sdk/Newton.h $PREFIX/include
cp newtonSDK/sdk/*.a $PREFIX/lib
cp newtonSDK/sdk/*.a ogreaddons/ogrenewt
Modified: trunk/python-ogre/scripts/06-GenerateCode.sh
===================================================================
--- trunk/python-ogre/scripts/06-GenerateCode.sh 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-09-29 06:46:30 UTC (rev 399)
@@ -3,10 +3,16 @@
# master config setup
source ./config.sh
-
echo "=== generating code ==="
echo "=== generating code ===" >> $INSTALL_DIR/log.out
cd python-ogre/code_generators
+if [ $1 != "" ]
+then
+ cd $1
+ python generate_code.py > build.out
+ cd ..
+else
+
echo ' -- creating OGRE code'
echo ' -- creating OGRE code' >> $INSTALL_DIR/log.out
cd ogre
@@ -57,14 +63,16 @@
cd theora
python generate_code.py > build.out
cd ..
-
-#echo ' -- creating OGREnewt code'
-#cd ogrenewt
-#python generate_code.py > build.out
-#cd ..
+echo ' -- creating OGREnewt code'
+echo ' -- creating OGREnewt code' >> $INSTALL_DIR/log.out
+cd ogrenewt
+python generate_code.py > build.out
+cd ..
#echo ' -- creating ode code'
#cd ode
#python generate_code.py > build.out
+
+fi
cd $INSTALL_DIR
echo
echo "=== done building code ==="
Modified: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh 2007-09-28 15:31:47 UTC (rev 398)
+++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-09-29 06:46:30 UTC (rev 399)
@@ -8,7 +8,13 @@
# compile code
#
cd python-ogre
-scons PROJECTS=ogre,ois,quickgui,cegui,plib,ogreode
+if [ $1 != "" ]
+then
+ scons PROJECTS=$1
+else
+ scons PROJECTS=ogre,ois,quickgui,cegui,plib,ogreode,ogrenewt
+fi
+#ogre,ois,quickgui,cegui,plib,ogreode
#,ogrerefapp
python setup.py install --prefix=$PREFIX
cd ..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
