|
From: <and...@us...> - 2008-11-18 23:09:49
|
Revision: 801
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=801&view=rev
Author: andy_miller
Date: 2008-11-18 23:09:45 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Add indexing lib to modules for Linux build
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-11-18 13:33:14 UTC (rev 800)
+++ trunk/python-ogre/environment.py 2008-11-18 23:09:45 UTC (rev 801)
@@ -749,7 +749,8 @@
libs=['OIS_Static',boost.lib]
else:
- libs=['OIS',boost.lib]
+ libs=['OIS',boost.lib]
+ libs.append ( boost_python_index.lib )
if os.name=="nt":
libs.append ( "User32" ) # needed for static linking
include_dirs = [ Config.PATH_Boost
@@ -784,7 +785,8 @@
if isWindows():
libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
else:
- libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Ogre_OgreMain
, Config.PATH_LIB_ODE
@@ -809,7 +811,8 @@
if isWindows():
libs = ['Newton', boost.lib, 'OgreNewt_Main', 'OgreMain']
else:
- libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
+ libs = ['Newton', boost.lib, 'OgreNewt', 'OgreMain']
+ libs.append ( boost_python_index.lib )
if _STABLE:
source = [
[cvs, " -d :pserver:ano...@cv...:/cvsroot/ogre co -D 01052008 -P "+base, os.getcwd()]
@@ -823,7 +826,7 @@
[0, "patch -s -N -i ../../python-ogre/patch/ogrenewt.patch -p0", baseDir],
#[0, "cp SConscript OgreNewt_Main", baseDir],
#[0, "rm SConscript", baseDir],
- [0, rm + " ./OgreNewt_Main/inc/boost", baseDir],
+ [0, rm + " -rf ./OgreNewt_Main/inc/boost", baseDir],
[0, "scons prefix=%s boost=%s/include/boost-1_34_1 install" % (PREFIX, PREFIX), baseDir], ##WARNING -- boost include dir name is different than build name (dash not underscore)
]
if isWindows():
@@ -864,7 +867,8 @@
pchincludes = ['boost/python.hpp', 'cegui.h']
libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'OgreGUIRenderer' ]
else:
- libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs=[boost.lib, 'CEGUIBase', 'OgreMain', 'CEGUIOgreRenderer' ]
+ libs.append ( boost_python_index.lib )
if isLinux():
if _STABLE:
@@ -936,7 +940,8 @@
if isWindows():
odeLibraryName = 'ode_single'
libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
-
+ else:
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_ODE
]
@@ -977,7 +982,9 @@
version= "1.3"
name = 'opcode'
parent = "ogre/physics"
- libs=[boost.lib]
+ libs=[boost.lib]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
]
include_dirs = [ Config.PATH_Boost
@@ -1054,7 +1061,8 @@
libs=[boost.lib, 'OgreMain', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
if isLinux():
- libs.append('ode')
+ libs.append('ode')
+ libs.append ( boost_python_index.lib )
else:
libs.append('ode_single')
CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19'
@@ -1090,7 +1098,9 @@
##,Config.PATH_LIB_quickgui
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="QuickGUI"
class navi:
@@ -1143,7 +1153,9 @@
CheckIncludes=[]
libs=[ boost.lib, 'OgreMain', 'OIS_Static' ]
if os.name=="nt":
- libs.append ( "User32" ) # needed for static linking
+ libs.append ( "User32" ) # needed for static linking
+ else:
+ libs.append ( boost_python_index.lib )
ModuleName="betagui"
@@ -1163,7 +1175,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ogreforests"
@@ -1184,7 +1198,9 @@
Config.PATH_LIB_particleuniverse
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
+ libs=[ boost.lib, 'OgreMain', 'ParticleUniverse' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="particleuniverse"
class nxogre:
@@ -1219,7 +1235,8 @@
if os.name =='nt':
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader','OgreMain','NxOgre' ] #, 'NxOgreStatic'] #'NxExtensions',
else:
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore','PhysXLoader','OgreMain', 'NxOgre' ]
+ libs.append ( boost_python_index.lib )
ModuleName="NxOgre"
@@ -1248,7 +1265,9 @@
Config.PATH_LIB_Theora,
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ libs=[ boost.lib, 'Plugin_TheoraVideoSystem','OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="theora"
class plib:
@@ -1269,7 +1288,8 @@
if os.name == "nt":
libs = [ boost.lib, 'winmm', 'User32','wsock32', 'opengl32.lib','glu32.lib' ]
else:
- libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
+ libs = [ boost.lib, "GL" ] # Note sure what linux libraries are needed
+ libs.append ( boost_python_index.lib )
class physx:
active = True
@@ -1296,7 +1316,8 @@
if isWindows():
libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXLoader' ]
elif isLinux():
- libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs=[ boost.lib, 'NxCharacter', 'NxCooking', 'PhysXCore', 'PhysXLoader' ]
+ libs.append ( boost_python_index.lib )
source = [
[wget, "http://developer.download.nvidia.com/PhysX/2.8.1/PhysX_2.8.1_SDK_CoreLinux_deb.tar.gz", downloadPath]
]
@@ -1422,7 +1443,7 @@
#'ogg',
#'vorbis','vorbisfile','vorbisenc',
'openal'] ## 'OgreAL' -- going to compile OgreAL ourselves
-
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreAL'
CheckIncludes = ['OgreAL.h']
@@ -1516,7 +1537,8 @@
libs.append('libbulletmath')
libs.append('libbulletsoftbody')
#libs.append('libbulletcolladaconverter')
- libs.append('libbulletmultithreaded')
+ libs.append('libbulletmultithreaded')
+ libs.append ( boost_python_index.lib )
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Bullet
@@ -1578,7 +1600,8 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP '
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletC'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
@@ -1611,7 +1634,8 @@
if isWindows():
CCFLAGS = ' -DWIN32 -DNDEBUG -D_WINDOWS -D_PRECOMP '
else:
- CCFLAGS = ' -D_PRECOMP '
+ CCFLAGS = ' -D_PRECOMP '
+ libs.append ( boost_python_index.lib )
ModuleName = 'OgreBulletD'
CheckIncludes=['boost/python.hpp', 'Ogre.h']
descText = "Ogre Bullet Dynamics (physics) implementation"
@@ -1629,9 +1653,11 @@
os.path.join(Config.PATH_INCLUDE_noise, 'module')
]
lib_dirs = [Config.PATH_LIB_Boost
- ]
+ ]
CheckIncludes=[]
libs=[ boost.lib]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="noise"
descText = "Generate 'noise'"
@@ -1650,7 +1676,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="watermesh"
descText = "C++ code from Ogre Water demo -- use Hydrax instead"
@@ -1669,7 +1697,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ofusion"
descText = "Import Ogre 'Scenes' from 3dMax using the ofusion exporter"
@@ -1688,7 +1718,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="cadunetree"
descText = "Generate realistic trees"
@@ -1704,10 +1736,13 @@
Config.PATH_INCLUDE_ogrepcz
]
lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain
+ Config.PATH_LIB_Ogre_OgreMain,
+ os.path.join(Config.PATH_LIB_Ogre_OgreMain, 'OGRE')
]
CheckIncludes=[]
- libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ libs=[ boost.lib, 'Plugin_PCZSceneManager', 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="ogrepcz"
descText = "Portal SceneManager - seamlessly move from interior to exterior scene management"
@@ -1726,7 +1761,9 @@
Config.PATH_LIB_opensteer
]
CheckIncludes=[]
- libs=[ boost.lib, 'opensteer' ]
+ libs=[ boost.lib, 'opensteer' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="opensteer"
class hydrax:
@@ -1744,7 +1781,9 @@
Config.PATH_LIB_Ogre_OgreMain
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain' ]
+ libs=[ boost.lib, 'OgreMain' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="hydrax"
descText = "Fantastic water/ocean effects"
@@ -1764,7 +1803,9 @@
Config.PATH_LIB_hikari
]
CheckIncludes=[]
- libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
+ libs=[ boost.lib, 'OgreMain', 'comsuppw', 'Gdi32' ] ##, 'hikari' ]
+ if isLinux():
+ libs.append ( boost_python_index.lib )
ModuleName="hikari"
descText = "Use Flash controls within Ogre"
descLink = "http://hikari-library.googlecode.com/"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
