[Python-ogre-commit] SF.net SVN: python-ogre: [386] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
Menu
▾
▴
[Python-ogre-commit] SF.net SVN: python-ogre: [386] trunk/python-ogre
|
From: <and...@us...> - 2007-09-22 05:01:36
|
Revision: 386
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=386&view=rev
Author: andy_miller
Date: 2007-09-21 22:01:38 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Clean up -- moving source into the PythonOgre thirdparty area (plib, ogreal, etc) to make building simpler
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -1,112 +1,92 @@
import os
SDK=True ## set to true if buiding from 1.4 release source...
-BASE_DIR = 'c:/development'
-root_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
+## The root directory is where this module is located
+module_dir = os.path.abspath(os.path.dirname(__file__) )
+BASE_DIR, ignore = os.path.split(module_dir)
-## Boost stuff
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
PATH_Boost = os.path.join(BASE_DIR, 'boost')
## Path to your boost_pythonxxxx lib file
PATH_LIB_Boost = os.path.join(BASE_DIR, 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi')
-## PATH_LIB_Boost = os.path.join(BASE_DIR, 'boost/bin.v2/libs/python2.4/build/msvc-7.1/release/threading-multi')
## and the name of the boost python library
-LIB_Boost = r'boost_python-vc71-mt-1_35'
LIB_Boost = r'boost_python-vc80-mt-1_35'
+
# We need to know where to find gccxml......
gccxml_bin = os.path.join(BASE_DIR, 'gccxml/bin/release/gccxml.exe')
# and the Py++ directory as sometimes we need access to the code repository there
pyplusplus_install_dir = os.path.join(BASE_DIR, 'pygccxml')
## Parent directories of the libraries
-PATH_Ogre = os.path.join(BASE_DIR,'Ogrenew')
+PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
+PATH_Ogre = os.path.join(BASE_DIR, 'ogrenew')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'cegui-0.5.0')
-PATH_OIS = os.path.join(BASE_DIR, 'ois')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
+PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk','sdk')
PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
-PATH_OGREAL= os.path.join(BASE_DIR, 'ogreal')
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_raknet= os.path.join(BASE_DIR, 'RakNet')
-PATH_OPCODE= os.path.join(BASE_DIR, 'Opcode')
-PATH_quickgui= os.path.join(root_dir, 'ThirdParty','quickgui')
-PATH_quickgui= os.path.join(BASE_DIR, 'Quickgui') ## note test for Quickgui SVN version
-PATH_betagui= os.path.join(root_dir, 'ThirdParty','betagui')
-PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.52')
-PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
-PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
-PATH_Dshow= os.path.join(root_dir, 'ThirdParty','dshow')
-PATH_ogrevideoffmpeg = os.path.join(root_dir, 'ThirdParty','ffmpeg')
-PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
-PATH_ogredshow = os.path.join(root_dir, 'ThirdParty','dshow')
-PATH_plib = os.path.join(BASE_DIR, 'plib')
-PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
+PATH_OGREAL= os.path.join(PATH_THIRDPARTY,,'ogreal')
+PATH_OPCODE= os.path.join(PATH_THIRDPARTY,'opcode')
+PATH_quickgui= os.path.join(PATH_THIRDPARTY,'quickgui')
+PATH_betagui= os.path.join(PATH_THIRDPARTY,'betagui')
+PATH_ogredshow = os.path.join(PATH_THIRDPARTY,'dshow')
+PATH_plib = os.path.join(PATH_THIRDPARTY, 'plib')
+PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
+PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.52')
+PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
+PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
+PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
#
# it's time for the SDK version
if SDK:
- PATH_Ogre = os.path.join(BASE_DIR, 'Ogrenew')
- PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'Ogrenew')
PATH_OIS = os.path.join(BASE_DIR, 'Ogrenew')
- PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
- PATH_OgreOde= os.path.join(BASE_DIR, 'OgreAddons','ogreode')
-
-
-
-## Overrides - this is needed as libs isn't defined in enirvonment for fmod..
-# # class fmod:
-# # version= "4.06"
-# # libs=[LIB_Boost, 'fmodexL_vc']
-# # ##libs=[Config.LIB_Boost, 'libfmodex'] ##posix
-
+
###
### these paths assume you've left all the directory structure as standard
### Override anything that is different
###
-PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
+PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
-PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
-PATH_LIB_OgreNewt = os.path.join(PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
-PATH_LIB_Newton = os.path.join(PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
-PATH_LIB_OIS = os.path.join(PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
-PATH_LIB_CEGUI = os.path.join ( PATH_CEGUI, 'lib' )
+PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
+PATH_LIB_OgreNewt = os.path.join( PATH_OgreAddons, 'ogrenewt/OgreNewt_Main/lib/Release')
+PATH_LIB_Newton = os.path.join( PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
+PATH_LIB_OIS = os.path.join( PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+PATH_LIB_CEGUI = os.path.join( PATH_CEGUI, 'lib' )
PATH_LIB_ODE = os.path.join( PATH_ODE, 'lib/releaselib')## probable releaselib for posix
+PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
PATH_LIB_OgreOde = os.path.join( PATH_OgreOde, 'lib/Release')
-PATH_LIB_OPCODE = os.path.join( PATH_OPCODE, 'Release')
PATH_LIB_OgreOdePrefab = os.path.join( PATH_OgreOde, 'prefab/lib/Release' )
PATH_LIB_OgreOdeLoader = os.path.join( PATH_OgreOde, 'loader/lib/Release' )
-PATH_LIB_FMOD = os.path.join(PATH_FMOD, 'api/lib')
-PATH_LIB_OgreAL = os.path.join(PATH_OGREAL, 'lib/Release' )
-PATH_LIB_betagui = PATH_betagui
-PATH_LIB_quickgui = os.path.join(PATH_quickgui, 'bin')
-PATH_LIB_raknet = os.path.join(PATH_raknet, 'Lib' )
+PATH_LIB_OgreAL = os.path.join( PATH_OGREAL)#, 'lib/Release' )
+PATH_LIB_betagui = PATH_betagui
+PATH_LIB_quickgui = PATH_quickgui
PATH_LIB_NxOgre= os.path.join(PATH_NxOgre, 'lib')
-PATH_LIB_PhysX = os.path.join(PATH_PhysX,'lib/win32')
-PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
-PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
-PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_LIB_PhysX = os.path.join(PATH_PhysX,'lib/win32')
+PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
+PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
+PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
-PATH_LIB_ogredshow = PATH_ogredshow
-PATH_LIB_plib = PATH_plib
-PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
+PATH_LIB_ogredshow = PATH_ogredshow
+PATH_LIB_plib = PATH_plib
+PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
if SDK:
- PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
- PATH_LIB_Ogre_OgreMain= os.path.join( PATH_Ogre, 'lib' )
- PATH_LIB_Ogre_Dependencies = os.path.join( PATH_Ogre, 'Dependencies/lib/Release')
- PATH_LIB_OgreRefApp = os.path.join( PATH_Ogre, 'lib')
- PATH_LIB_OIS = os.path.join(PATH_Ogre, 'Dependencies/lib/Release') ## NOTE Posix platforms this lives in'lib' not 'dll'
- PATH_LIB_CEGUI = os.path.join ( PATH_Ogre, r'lib' )
+ PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
+ PATH_LIB_OIS = os.path.join( PATH_Ogre, 'Dependencies/lib/Release') ## NOTE Posix platforms this lives in'lib' not 'dll'
+ PATH_LIB_CEGUI = os.path.join( PATH_Ogre, 'lib' )
@@ -115,14 +95,14 @@
PATH_INCLUDE_OIS = os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
PATH_INCLUDE_OgreNewt = os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
-PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, r'include/CEGUI')
+PATH_INCLUDE_CEGUI = os.path.join(PATH_CEGUI, 'include/CEGUI')
PATH_INCLUDE_ODE = os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_OPCODE = PATH_OPCODE
-PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src')
-PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL, 'include' )
+PATH_INCLUDE_ODESOURCE = os.path.join( PATH_ODE, 'ode/src')
+PATH_INCLUDE_OgreAL = os.path.join( PATH_OGREAL)#, 'include' )
PATH_INCLUDE_OPENAL = os.path.join( PATH_OPENAL, 'include')
-PATH_INCLUDE_OGG= os.path.join( PATH_OGG, r'include' )
-PATH_INCLUDE_VORBIS= os.path.join( PATH_VORBIS, r'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_OgreOde = os.path.join( PATH_OgreOde,'include')
PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
@@ -130,18 +110,16 @@
PATH_INCLUDE_FMOD = os.path.join(PATH_FMOD, 'api/inc')
PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
PATH_INCLUDE_quickgui = os.path.join(PATH_quickgui,'QuickGUI','include')
-PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
PATH_INCLUDE_Bullet= os.path.join(PATH_Bullet, 'src')
-PATH_INCLUDE_freetype= os.path.join(PATH_INCLUDE_quickgui,'FreeType2.3.5')
-PATH_INCLUDE_betagui = PATH_betagui
-PATH_INCLUDE_Dshow= PATH_Dshow
-PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_freetype= os.path.join(PATH_INCLUDE_quickgui,'FreeType2.3.5')
+PATH_INCLUDE_betagui = PATH_betagui
+PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
-PATH_INCLUDE_ogredshow = PATH_ogredshow
-PATH_INCLUDE_plib = PATH_plib
-PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_ogredshow = PATH_ogredshow
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
@@ -158,9 +136,7 @@
]
if SDK:
- PATH_INCLUDE_Ogre= os.path.join(PATH_Ogre,'OgreMain/include')
PATH_INCLUDE_OIS = os.path.join(PATH_Ogre,'Dependencies/include/OIS') ## Note the plural include's
-# PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'samples/refapp/include')
PATH_INCLUDE_CEGUI = os.path.join(PATH_Ogre, 'Dependencies/include/CEGUI')
\ No newline at end of file
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -1,17 +1,16 @@
import sys,os
-
## Boost stuff
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
module_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-ROOT_DIR = os.path.join(BASE_DIR,'root')
+ROOT_DIR = os.path.join(BASE_DIR,'root')
root_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
-LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
+LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_34')
@@ -28,78 +27,64 @@
# # ## Parent directories of the libraries
+PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' )
PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
-PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK/sdk')
-# # PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
+PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK','sdk')
PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
-PATH_OGREAL= os.path.join(BASE_DIR, 'OgreAL')
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_betagui= os.path.join(BASE_DIR, 'betagui')
-# PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
-PATH_simplegui= os.path.join(module_dir, 'ThirdParty/simplegui')
-PATH_quickgui= os.path.join(BASE_DIR, 'quickgui') ## note test for Quickgui SVN version
-PATH_plib = os.path.join(BASE_DIR, 'plib')
-PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
-PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
-PATH_PhysX= os.path.join(BASE_DIR, 'AGEIA Technologies/SDK/v2.7.2/SDKs')
-PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
-PATH_ogrevideoffmpeg = os.path.join(root_dir, 'ThirdParty','ffmpeg')
-PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_OgreOde= os.path.join(BASE_DIR, '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')
+PATH_betagui= os.path.join(PATH_THIRDPARTY,'betagui')
+PATH_ogredshow = os.path.join(PATH_THIRDPARTY,'dshow')
+PATH_plib = os.path.join(PATH_THIRDPARTY, 'plib')
+PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')
+PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
+PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.52')
+PATH_PhysX= os.path.join(BASE_DIR, 'AGEIA Technologies/SDK/v2.7.2/SDKs')
+PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
+PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
-
-
-# # # Overrides - this is needed as libs isn't defined in enirvonment for fmod..
-# # #class fmod:
-# # # version= "4.06"
-# # # libs=[LIB_Boost, 'fmodexL_vc']
-# # ##libs=[Config.LIB_Boost, 'libfmodex'] ##posix
-
-# # ###
-# # ### these paths assume you've left all the directory structure as standard
-# # ### Override anything that is different
-# # ###
+###
+### these paths assume you've left all the directory structure as standard
+### Override anything that is different
+###
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( LOCAL_LIB ) #, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( LOCAL_LIB ) # PATH_Ogre, 'OgreMain/lib/Release' )
PATH_LIB_Ogre_Dependencies = os.path.join( LOCAL_LIB ) # , 'Dependencies/lib/Release')
-PATH_LIB_quickgui = os.path.join(PATH_quickgui, 'bin')
-
-
-
PATH_LIB_OgreRefApp = os.path.join( LOCAL_LIB ) # PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
PATH_LIB_OgreNewt = os.path.join( LOCAL_LIB ) #PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
PATH_LIB_Newton = os.path.join( LOCAL_LIB ) # PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
PATH_LIB_OIS = os.path.join( LOCAL_LIB ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
-PATH_LIB_CEGUI = os.path.join ( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
+PATH_LIB_CEGUI = os.path.join( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
+PATH_LIB_OPCODE = os.path.join( PATH_OPCODE )
PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
PATH_LIB_OgreOdePrefab = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'prefab/lib/Release' )
PATH_LIB_OgreOdeLoader = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'loader/lib/Release' )
-
PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
-PATH_LIB_simplegui = PATH_simplegui
-# PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
-PATH_LIB_OPCODE = os.path.join( LOCAL_LIB )
-PATH_LIB_Bullet = os.path.join( LOCAL_LIB )
-PATH_LIB_plib = PATH_plib
-PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
+PATH_LIB_quickgui = PATH_quickgui
+PATH_LIB_Bullet = os.path.join( LOCAL_LIB )
+PATH_LIB_plib = PATH_plib
+PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
PATH_LIB_NxOgre= os.path.join(LOCAL_LIB )
-PATH_LIB_PhysX = os.path.join(PATH_PhysX,'lib/win32')
-PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
-PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_LIB_PhysX = os.path.join(LOCAL_LIB)
+PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
+PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
-
PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
@@ -107,33 +92,27 @@
PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ode') #os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
-
-PATH_INCLUDE_quickgui = os.path.join(PATH_quickgui,'QuickGUI','include')
-
-PATH_INCLUDE_OgreAL = ''# os.path.join( PATH_OGREAL, 'include' )
-PATH_INCLUDE_OPENAL = ''# os.path.join( PATH_OPENAL, 'include')
-PATH_INCLUDE_OGG= ''# os.path.join( PATH_OGG, r'include' )
-PATH_INCLUDE_VORBIS= ''# os.path.join( PATH_VORBIS, r'include' )
-PATH_INCLUDE_ALUT= ''# os.path.join( PATH_ALUT, 'include' )
-
+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_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')
PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
-
PATH_INCLUDE_betagui = PATH_betagui
-PATH_INCLUDE_simplegui = PATH_simplegui
-# PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/include')
PATH_INCLUDE_OPCODE = os.path.join( LOCAL_INCLUDE )
PATH_INCLUDE_Bullet = os.path.join( LOCAL_INCLUDE )
-PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
-PATH_INCLUDE_plib = PATH_plib
-PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
-PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
-PATH_INCLUDE_plib = PATH_plib
-PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
@@ -147,4 +126,4 @@
,os.path.join(PATH_PhysX, 'PhysXLoader','include')
,os.path.join(PATH_PhysX, 'NxCharacter','include')
,os.path.join(PATH_PhysX, 'NxExtensions','include')
- ]
+ ]
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -707,7 +707,7 @@
iter_as_generator_map( cls )
rt = mb.class_( 'RenderQueueListener' )
-# # # # # # # # rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
+ rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
# cls = mb.class_('Animation').class_('NodeTrackIterator')
# iter_as_generator_map( cls )
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -237,7 +237,24 @@
# if not os.path.exists( os.path.join(environment.ogreal.generated_dir, 'py_shared_ptr.h' ) ):
# shutil.copy( os.path.join( environment.shared_ptr_dir, 'py_shared_ptr.h' )
# , environment.ogreal.generated_dir )
-
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generated directory.. Also cope with sub directories
+ additional_dirs=[
+ [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal'),''],
+# [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra'),''],
+# [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra','ogg'),'ogg'],
+# # [os.path.join(environment.Config.root_dir, 'ThirdParty', 'ogreal', 'extra','vorbis'),'vorbis'],
+ ]
+ for d,d1 in additional_dirs:
+ for f in os.listdir(d):
+ if f.endswith('cpp') or f.endswith('.h') or f.endswith('.c'):
+ sourcefile = os.path.join(d, f)
+ destfile = os.path.join(environment.ogreal.generated_dir, d1, f )
+ if not os.path.exists ( os.path.join(environment.ogreal.generated_dir, d1 ) ):
+ os.mkdir ( os.path.join(environment.ogreal.generated_dir, d1 ) )
+ if not common_utils.samefile( sourcefile ,destfile ):
+ shutil.copy( sourcefile, environment.ogreal.generated_dir )
+ print "Updated ", f, "as it was missing or out of date"
if __name__ == '__main__':
start_time = time.clock()
generate_code()
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -113,9 +113,9 @@
global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('Matrix4').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('Plugin').include(already_exposed=True)
- print "\nCLASSES::: Std"
- for c in global_ns.namespace('std').classes():
- print c.name, c
+# print "\nCLASSES::: Std"
+# for c in global_ns.namespace('std').classes():
+# print c.name, c
global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').exclude()
# print "\nCLASSES::: Ode"
Modified: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -542,9 +542,7 @@
## now we need to ensure a series of headers and additional source files are
## copied to the generaated directory..
additional_files = []
- paths = [os.path.join(environment.Config.PATH_plib,'src','sl'),
- os.path.join(environment.Config.PATH_plib,'src','util'),
- os.path.join(environment.Config.PATH_plib,'src','net')
+ paths = [environment.Config.PATH_plib
]
for p in paths:
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -77,7 +77,8 @@
excludes=[\
'::QuickGUI::QuadContainer::_populateRenderObjectList'
,'::QuickGUI::QuadContainer::_updateRenderQueue'
- ##,'::QuickGUI::GUIManager::getDefaultFont'
+ ,'::QuickGUI::HorizontalTrackBar::_getButtonSize'
+ ,'::QuickGUI::List::getNumberOfListItems'
]
for e in excludes:
print "excluding function", e
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-20 07:09:24 UTC (rev 385)
+++ trunk/python-ogre/environment.py 2007-09-22 05:01:38 UTC (rev 386)
@@ -27,7 +27,7 @@
print __file__, "LOG::", instring
PythonOgreMajorVersion = "1"
-PythonOgreMinorVersion = "0" # change to 0.7 due to lowercase properties
+PythonOgreMinorVersion = "1" # change to 0.7 due to lowercase properties
PythonOgrePatchVersion = "0"
@@ -370,7 +370,7 @@
version="0.9.6"
parent="ogre/gui"
## note the defined for _QuickGUIExport forces non dll usage
- CCFLAGS = ' /D WIN32 /D NDEBUG /D WINDOWS /D _QuickGUIExport="" '
+ CCFLAGS = ' -DWIN32 -DNDEBUG -DWINDOWS -D_QuickGUIExport="" '
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
@@ -389,7 +389,7 @@
class navi:
version="0.9"
parent="ogre/gui"
- CCFLAGS = '/D "WIN32" /D "NDEBUG", /D "WINDOWS"'
+ CCFLAGS = '-D"WIN32" -D"NDEBUG", -D"WINDOWS"'
cflags=""
include_dirs = [ Config.PATH_Boost
,Config.PATH_INCLUDE_Ogre
@@ -411,7 +411,7 @@
class betagui:
version="0.16"
parent="ogre/gui"
- CCFLAGS = ' ' # /D "FT2_BUILD_LIBRARY"
+ CCFLAGS = ' ' # -D"FT2_BUILD_LIBRARY"
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
@@ -438,7 +438,7 @@
for d in Config.PATH_INCLUDE_PhysX:
include_dirs.append( d )
if os.name == 'nt':
- CCFLAGS = ' /D "WIN32" '
+ CCFLAGS = ' -D"WIN32" '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
@@ -463,7 +463,7 @@
include_dirs.append( d )
if os.name == 'nt':
- CCFLAGS = ' /D "WIN32" '
+ CCFLAGS = ' -D"WIN32" '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
@@ -478,12 +478,11 @@
version="1.8.4"
parent="ogre/addons"
cflags=""
- CCFLAGS = ' /D "_CRT_SECURE_NO_WARNINGS" '
+ CCFLAGS = ' -D"_CRT_SECURE_NO_WARNINGS" '
include_dirs= [ Config.PATH_INCLUDE_plib,
- os.path.join ( Config.PATH_INCLUDE_plib,"..") # needed as net.h includes via plib/xxxx
+ Config.PATH_THIRDPARTY # needed as net.h includes via plib/xxxx
]
lib_dirs = [ Config.PATH_LIB_Boost,
- Config.PATH_LIB_plib
]
ModuleName = "plib"
CheckIncludes=[]
@@ -504,7 +503,7 @@
for d in Config.PATH_INCLUDE_PhysX:
include_dirs.append( d )
if os.name == 'nt':
- CCFLAGS = ' /D "WIN32" '
+ CCFLAGS = ' -D"WIN32" '
lib_dirs = [Config.PATH_LIB_Boost,
Config.PATH_LIB_Ogre_OgreMain,
@@ -514,22 +513,9 @@
libs=[ Config.LIB_Boost, 'NxCharacter', 'NxCooking', 'NxExtensions', 'PhysXLoader' ]
ModuleName="PhysX"
active=True
-# class raknet:
-# version="1.0"
-# parent="ogre/network"
-# cflags = ""
-# include_dirs = [ Config.PATH_Boost,
-# Config.PATH_INCLUDE_raknet
-# ]
-# lib_dirs = [Config.PATH_LIB_Boost,
-# Config.PATH_LIB_raknet
-# ]
-# CheckIncludes=[]
-# libs=[ Config.LIB_Boost, 'RakNetLibStatic' ] # could use RakNetDll
-# ModuleName="raknet"
-# active=True
class ogreal:
+ ## changes to compile ogreal as part of Python-Ogre to make it easier under linux
version="0.3"
parent = "ogre/sound"
@@ -540,12 +526,29 @@
, Config.PATH_INCLUDE_VORBIS
, Config.PATH_INCLUDE_OPENAL
, Config.PATH_INCLUDE_ALUT
- ]
- lib_dirs = [ Config.PATH_LIB_Boost
- ,Config.PATH_LIB_Ogre_OgreMain
- , Config.PATH_LIB_OgreAL
+ ]
+ if os.name=='nt':
+ lib_dirs = [ Config.PATH_LIB_Boost
+ ,Config.PATH_LIB_Ogre_OgreMain
+ ,os.path.join(Config.PATH_OGG, 'win32', 'Static_Release')
+ ,os.path.join(Config.PATH_VORBIS, 'win32','Vorbis_Static_Release')
+ ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisEnc_Static_Release')
+ ,os.path.join(Config.PATH_VORBIS, 'win32','VorbisFile_Static_Release')
+ ,os.path.join(Config.PATH_OPENAL, 'libs','Win32')
+ ,os.path.join(Config.PATH_ALUT, 'lib')
]
- libs=[Config.LIB_Boost, 'OgreMain', 'OgreAL']
+ else:
+ lib_dirs = [ Config.PATH_LIB_Boost
+ ,Config.PATH_LIB_Ogre_OgreMain
+ ]
+
+ if os.name =='nt':
+ CCFLAGS = ' -DOgreAL_Export="" -DWIN32 -DNDEBUG -D_LIB -D_WIN32 -D_WINDOWS -DVORBIS_IEEE_FLOAT32 -D_USE_NON_INTEL_COMPILER '
+ libs=[Config.LIB_Boost, 'OgreMain',
+ 'ogg_static',
+ 'alut',
+ 'vorbis_static','vorbisfile_static','vorbisenc_static',
+ 'OpenAL32', 'EFX-Util'] ## 'OgreAL' -- going to compile OgreAL ourselves
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
active=True
@@ -572,27 +575,22 @@
ModuleName="ogrevideoffmpeg"
active=True
-class ogredshow:
+class ogredshow:
version="0.1"
parent="ogre/addons"
cflags = ""
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_Ogre,
+ Config.PATH_INCLUDE_ogredshow
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain,
+ Config.PATH_LIB_ogredshow
+ ]
+ CheckIncludes=[]
+ libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
ModuleName="ogredshow"
- if os.name == "nt":
- include_dirs = [ Config.PATH_Boost,
- Config.PATH_INCLUDE_Ogre,
- Config.PATH_INCLUDE_ogredshow
- ]
- lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain,
- Config.PATH_LIB_ogredshow
- ]
- CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
- active=True
- else:
- active=False
-
-
+ active=True
############################################################################################
## Here is the master list....
@@ -619,7 +617,6 @@
, 'ogredshow' : ogredshow
, 'plib' : plib
, 'navi': navi
- #, 'raknet' : raknet
}
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
