[Python-ogre-commit] SF.net SVN: python-ogre: [427] trunk/python-ogre

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

Revision: 427
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=427&view=rev
Author:   andy_miller
Date:     2007-10-15 17:05:06 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
linux fixes

Modified Paths:
--------------
    trunk/python-ogre/PythonOgreConfig_posix.py
    trunk/python-ogre/ThirdParty/quickgui/QuickGUIUtility.cpp

Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py	2007-10-15 23:38:29 UTC (rev 426)
+++ trunk/python-ogre/PythonOgreConfig_posix.py	2007-10-16 00:05:06 UTC (rev 427)
@@ -54,7 +54,7 @@
 PATH_NxOgre=        os.path.join(PATH_THIRDPARTY, 'nxogre')
 # PATH_NxOgre=        os.path.join(BASE_DIR, 'nxogre/NxOgre')
 PATH_Bullet=        os.path.join(BASE_DIR, 'bullet-2.63final') 
-PATH_PhysX=         os.path.join(BASE_DIR, 'AGEIA Technologies/SDK/v2.7.2/SDKs')
+###PATH_PhysX=         os.path.join(BASE_DIR, 'Physx/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')
@@ -82,7 +82,7 @@
 PATH_LIB_betagui =              PATH_betagui
 PATH_LIB_quickgui =             PATH_quickgui
 # PATH_LIB_NxOgre=                os.path.join(LOCAL_LIB )
-PATH_LIB_PhysX =                os.path.join(LOCAL_LIB)
+PATH_LIB_PhysX =                os.path.join(LOCAL_LIB, 'PhysX','v2.7.2')
 PATH_LIB_Bullet = 		        os.path.join( LOCAL_LIB )
 PATH_LIB_Theora=                os.path.join(PATH_Theora, 'bin', 'Release')
 PATH_LIB_ogrevideoffmpeg =      PATH_ogrevideoffmpeg
@@ -135,11 +135,11 @@
                         ,os.path.join(PATH_OgreAddons,'videoplugin','theora','include')
                         ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include')
                         ]
-
-PATH_INCLUDE_PhysX= [ os.path.join(PATH_PhysX, 'Physics','include')
-                    ,os.path.join(PATH_PhysX, 'Cooking','include')
-                    ,os.path.join(PATH_PhysX, 'Foundation','include')
-                    ,os.path.join(PATH_PhysX, 'PhysXLoader','include')
-                    ,os.path.join(PATH_PhysX, 'NxCharacter','include')
-                    ,os.path.join(PATH_PhysX, 'NxExtensions','include')
+physxbase = os.path.joing(LOCAL_INCLUDE, 'PhysX','v2.7.2')
+PATH_INCLUDE_PhysX= [ physxbase
+                    ,os.path.join(physxbase, 'Cooking','include')
+                    ,os.path.join(physxbase, 'Foundation','include')
+                    ,os.path.join(physxbase, 'PhysXLoader','include')
+                    ,os.path.join(physxbase, 'NxCharacter','include')
+                    ,os.path.join(physxbase, 'NxExtensions','include')
                     ]

Modified: trunk/python-ogre/ThirdParty/quickgui/QuickGUIUtility.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/quickgui/QuickGUIUtility.cpp	2007-10-15 23:38:29 UTC (rev 426)
+++ trunk/python-ogre/ThirdParty/quickgui/QuickGUIUtility.cpp	2007-10-16 00:05:06 UTC (rev 427)
@@ -55,7 +55,7 @@
 			Ogre::String extension = fileName.substr(index + 1);
 			Ogre::StringUtil::toLowerCase(extension);
 
-			Ogre::StringVector& supportedImageCodecs = Ogre::Codec::getExtensions();
+			Ogre::StringVector supportedImageCodecs = Ogre::Codec::getExtensions();
 
 			return (std::find(supportedImageCodecs.begin(),supportedImageCodecs.end(),extension) != supportedImageCodecs.end());
 		}


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