[Python-ogre-commit] SF.net SVN: python-ogre:[715] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <mi...@us...> - 2008-09-01 11:45:47
|
Revision: 715 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=715&view=rev Author: mithro Date: 2008-09-01 11:45:49 +0000 (Mon, 01 Sep 2008) Log Message: ----------- Add support for Ogre 1.6RC1 in Linux. Fixed CEGUI pointing to version 0.6.0. Modified Paths: -------------- trunk/python-ogre/PythonOgreConfig_posix.py trunk/python-ogre/environment.py Modified: trunk/python-ogre/PythonOgreConfig_posix.py =================================================================== --- trunk/python-ogre/PythonOgreConfig_posix.py 2008-09-01 06:06:29 UTC (rev 714) +++ trunk/python-ogre/PythonOgreConfig_posix.py 2008-09-01 11:45:49 UTC (rev 715) @@ -39,7 +39,7 @@ PATH_THIRDPARTY = os.path.join(module_dir, 'ThirdParty' ) PATH_Ogre = os.path.join(BASE_DIR,'ogre') PATH_OgreAddons = os.path.join(BASE_DIR, 'ogreaddons') -PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.0' ) +PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.6.1' ) PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1') if SDK: Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2008-09-01 06:06:29 UTC (rev 714) +++ trunk/python-ogre/environment.py 2008-09-01 11:45:49 UTC (rev 715) @@ -546,10 +546,6 @@ class ogre: active = True pythonModule = True - if _STABLE: - version="1.6" - else: - version = "1.7" name='ogre' ModuleName='OGRE' cflags = "" @@ -563,6 +559,7 @@ if isWindows(): if _STABLE: + version="1.6" source = [ [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath], [ wget, "http://downloads.sourceforge.net/ogre/ogre-v1-6-0RC1.zip", downloadPath], @@ -574,7 +571,9 @@ [0, "patch -s -N -i ./python-ogre/patch/ogre_1.6.patch -p0 ", os.getcwd()], [0,'echo Please use MSVC Express Edition to build Ogre Release.',''] ] - else: + else: + + version="1.7" source = [ [ wget, "http://downloads.sourceforge.net/ogre/OgreDependencies_VC9_Eihort_20080203.zip", downloadPath], [ svn, "https://svn.ogre3d.org/svnroot/ogre/branches/v1-6", os.path.join(os.getcwd(), 'ogre')] @@ -591,8 +590,8 @@ pchstop = 'python_ogre_precompiled.h' pchbuild = 'buildpch.cpp' pchincludes = ['python_ogre_precompiled.h'] -# - libs=[boost.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase'] + + libs=[boost.lib, 'OgreMain'] lib_dirs = [ Config.PATH_LIB_Boost , Config.PATH_LIB_Ogre_CEGUIRenderer , Config.PATH_LIB_Ogre_OgreMain @@ -606,33 +605,33 @@ LINKFLAGS = '' externalFiles=['OgreMain.dll', 'OgreGuiRender.dll', boost.lib+'.dll'] elif isLinux(): - version = "1.4" #### UGLY OVERRIDE AT MOMENT... - libs=[boost.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase'] - base = "ogre-v1-4-9" + if _STABLE: + version = "1.4" + base = "ogre-v1-4-9" + else: + version = "1.6" + base = "ogre-v1-6-0RC1" + + libs=[boost.lib, boost_python_index.lib, 'OgreMain'] + lib_dirs=[Config.LOCAL_LIB] + include_dirs=[Config.PATH_Boost, Config.PATH_INCLUDE_Ogre] + CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' + source = [ [wget, "http://downloads.sourceforge.net/ogre/"+base+".tar.bz2",downloadPath], ] buildCmds = [ - # [0, "env >1", ''], - [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ], - [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()], - [0, "aclocal", os.path.join(os.getcwd(), 'ogre')], - [0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')], - #[1, "import os\nos.environ['ZZIPLIB_LIBS']='-lzzip'", ''], - [0, "./configure --prefix=%s --with-gui=Xt --disable-devil" % PREFIX, os.path.join(os.getcwd(), 'ogre')], - #export ZZIPLIB_LIBS="-lzzip" - [0, "make", os.path.join(os.getcwd(), 'ogre')], - [0, "make install", os.path.join(os.getcwd(), 'ogre')], - ] - - libs=[boost.lib, boost_python_index.lib, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase'] - lib_dirs = [ Config.LOCAL_LIB - ] - include_dirs = [ Config.PATH_Boost - , Config.PATH_INCLUDE_Ogre - ] - CCFLAGS = ' -DBOOST_PYTHON_MAX_ARITY=19' + [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ], + [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()], + [0, "aclocal", os.path.join(os.getcwd(), 'ogre')], + [0, "./bootstrap", os.path.join(os.getcwd(), 'ogre')], + [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')], + ] + elif isMac(): + version = "1.4" base = "ogre-linux_osx-v1-4-9" basedep = "OgreDependenciesOSX_20070929" source = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |