[Python-ogre-commit] SF.net SVN: python-ogre:[683] trunk/python-ogre/environment.py

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

Revision: 683
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=683&view=rev
Author:   andy_miller
Date:     2008-08-02 02:45:14 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Fixes for Windows compile with ode 0.10.1

Modified Paths:
--------------
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-08-01 15:46:47 UTC (rev 682)
+++ trunk/python-ogre/environment.py	2008-08-02 02:45:14 UTC (rev 683)
@@ -735,7 +735,7 @@
                 [0, "make install", baseDir],
                 ]
     if isWindows():
-        libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
+        libs=[boost.lib, 'OgreMain', 'ode_single', 'ReferenceAppLayer']
     else:
         libs=[boost.lib, 'OgreMain', 'ode', 'ReferenceAppLayer']
     lib_dirs = [ Config.PATH_LIB_Boost
@@ -881,10 +881,12 @@
     version= "0.10"
     name ='ode'
     parent = "ogre/physics"
-    libs=[boost.lib,  'ode']
+    odeLibraryName = 'ode'
+    libs=[boost.lib,  odeLibraryName]
     
     if isWindows():
-        libs= [boost.lib, 'ode_single', 'User32'] # needed for MessageBox function
+        odeLibraryName = 'ode_single'
+        libs= [boost.lib, odeLibraryName, 'User32'] # needed for MessageBox function
         
     lib_dirs = [ Config.PATH_LIB_Boost
                 ,  Config.PATH_LIB_ODE
@@ -1000,7 +1002,11 @@
             [0, "make install", baseDir],
             ]
 
-    libs=[boost.lib, 'OgreMain', 'ode', 'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
+    libs=[boost.lib, 'OgreMain',  'OgreOde_Core', 'OgreOde_Prefab', 'OgreOde_Loader' ]
+    if isLinux():
+        libs.append('ode')
+    else:
+        libs.append('ode_single')        
     CCFLAGS =  ' -DBOOST_PYTHON_MAX_ARITY=19'
     CheckIncludes = ['boost/python.hpp', 'Ogre.h', 'ode/ode.h', 'ode/odecpp.h', 'OgreOde_Core.h', 'OgreOde_Loader.h', 
                     'Ogreode_Prefab.h'] 


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