|
From: <and...@us...> - 2008-09-28 00:17:25
|
Revision: 750
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=750&view=rev
Author: andy_miller
Date: 2008-09-28 00:17:18 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
Environment.py correct this time..
Modified Paths:
--------------
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2008-09-28 00:14:41 UTC (rev 749)
+++ trunk/python-ogre/environment.py 2008-09-28 00:17:18 UTC (rev 750)
@@ -457,14 +457,17 @@
if _STABLE:
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
+ versionBase = '1_36' ## the version used on the library name
else:
base = 'boost_1_36_0'
lib = 'boost_python-vc90-mt-1_36'
+ versionBase = '1_36' ## the version used on the library name
else:
if _STABLE:
base = 'boost_1_34_1'
+ versionBase = '1_34' ## the version used on the library name
else:
- base = 'boost_1_36_0'
+ base = 'boost_1_36_0'
versionBase = '1_36' ## the version used on the library name
if isLinux() or isMac():
@@ -514,7 +517,7 @@
[0,'sed -i s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
[0,'sed -i s/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
[0,os.path.join(os.getcwd(), bjambase, "bjam.exe") + ' release --with-python ',os.path.join(os.getcwd(),base)] # --toolset=msvc-8
- ]
+ ]
if not isWindows():
# Figure out the gcc version we are running - this is needed by Boost
@@ -529,7 +532,7 @@
class boost_python_index:
""" only used for Linx
"""
- active = True
+ active = True
source_version = boost.versionBase.replace("_",".")
pythonModule = False
ModuleName = ""
@@ -626,7 +629,7 @@
[0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')],
[0, "make", os.path.join(os.getcwd(), 'ogre')],
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
- ]
+ ]
else:
version = "1.6.0RC1"
base = "ogre-v1-6-0RC1"
@@ -639,7 +642,7 @@
[0, "make", os.path.join(os.getcwd(), 'ogre')],
[0, "make install", os.path.join(os.getcwd(), 'ogre')],
]
- libs=[boost.lib, 'OgreMain']
+ libs=[boost.lib, 'OgreMain']
libs.append ( boost_python_index.lib )
lib_dirs=[Config.LOCAL_LIB]
include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre]
@@ -1470,12 +1473,12 @@
parent = "ogre/physics"
libs=[boost.lib, 'LibBulletCollision', 'LibBulletDynamics']
if isWindows():
- libs.append('libbulletmath')
- else:
- libs.append('LibLinearMath')
- libs.append('LibBulletSoftBody')
- libs.append('LibBulletColladaConverter')
- libs.append('LibBulletMultiThreaded')
+ libs.append('libbulletmath')
+ else:
+ libs.append('LibLinearMath')
+ libs.append('LibBulletSoftBody')
+ libs.append('LibBulletColladaConverter')
+ libs.append('LibBulletMultiThreaded')
lib_dirs = [ Config.PATH_LIB_Boost
, Config.PATH_LIB_Bullet
@@ -1516,9 +1519,9 @@
'LibBulletCollision', 'LibBulletDynamics'
]
if isWindows():
- libs.append('libbulletmath')
- else:
- libs.append('LibLinearMath')
+ libs.append('libbulletmath')
+ else:
+ libs.append('LibLinearMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
@@ -1547,9 +1550,9 @@
'LibBulletCollision', 'LibBulletDynamics'
]
if isWindows():
- libs.append('libbulletmath')
- else:
- libs.append('LibLinearMath')
+ libs.append('libbulletmath')
+ else:
+ libs.append('LibLinearMath')
include_dirs = [Config.PATH_Boost
, Config.PATH_INCLUDE_Bullet
, os.path.join(Config.PATH_OgreBullet, 'Collisions' )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
