[Python-ogre-commit] SF.net SVN: python-ogre: [528] trunk/python-ogre
Brought to you by:
andy_miller,
roman_yakovenko
From: <and...@us...> - 2008-01-06 05:41:54
|
Revision: 528 http://python-ogre.svn.sourceforge.net/python-ogre/?rev=528&view=rev Author: andy_miller Date: 2008-01-05 21:41:58 -0800 (Sat, 05 Jan 2008) Log Message: ----------- V2 build fixes --this line, and those below, will be ignored-- M environment.py M SConstruct M demos/ogre/plugins.cfg Modified Paths: -------------- trunk/python-ogre/SConstruct trunk/python-ogre/demos/ogre/plugins.cfg trunk/python-ogre/environment.py Modified: trunk/python-ogre/SConstruct =================================================================== --- trunk/python-ogre/SConstruct 2007-12-31 07:21:40 UTC (rev 527) +++ trunk/python-ogre/SConstruct 2008-01-06 05:41:58 UTC (rev 528) @@ -65,7 +65,7 @@ CCFLAGS += ' ' else: - CCFLAGS = ' -I -pipe -Os -I./' + CCFLAGS = ' -I -pipe -O3 -I./' return CCFLAGS def get_source_files(cls, _dir, usepch = False): @@ -89,15 +89,15 @@ return source_files ## "Image.pypp.cpp" ##source_files def get_linkflags(): - if os.name=='nt': + if environment.isWindows(): #LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /OPT:NOREF /OPT:NOICF /OPT:NOWIN98 /subsystem:console " # no change LINKFLAGS = " /MAP:FULL /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /subsystem:console " # 7 minutes 25% smaller 16.6 Meg #LINKFLAGS = " /NOLOGO /INCREMENTAL:NO /DLL /subsystem:console " ### LONG Link , 80 minutes - 15.7 meg - elif os.name == 'posix': + if environment.isLinux(): if os.sys.platform <> 'darwin': LINKFLAGS = ' `pkg-config --libs OGRE` --strip-all -lstdc++ ' - else: - LINKFLAGS = '' + if environment.isMac(): + LINKFLAGS = ' -Wl,-x -framework Python -framework Ogre -framework Carbon -F' + environment.Config.FRAMEWORK_DIR + ' ' return LINKFLAGS def build_pch( cls, pchfile ): @@ -149,8 +149,7 @@ _env = Environment(ENV=os.environ) if environment.rpath: - _env.Append(RPATH=_env.Literal(environment.rpath)) - _env.Append( LINKFLAGS = Split('-z origin') ) + _env.Append(RPATH=environment.rpath) # Stores signatures in a separate .sconsign file # in each directory as the single one was getting huge @@ -204,13 +203,16 @@ ## ugly hack - scons returns a list of targets from SharedLibrary - we have to choose the one we want index = 0 # this is the index into a list of targets - '0' should be the platform default - if os.name=="nt": + if environment.isWindows(): ## and lets have it install the output into the 'package_dir_name/ModuleName' dir and rename to the PydName _env.AddPostAction(package,\ 'mt.exe -nologo -manifest %(name)s.manifest -outputresource:%(name)s;2' % { 'name':package[index] } ) - else: + if environment.isLinux(): _env.AddPostAction(package,\ '-strip -g -S -d --strip-debug -s %(name)s' % { 'name':package[index] } ) + if environment.isMac(): + _env.AddPostAction(package,\ + '-strip -s %(name)s' % { 'name':package[index] } ) _env.InstallAs(os.path.join(environment.package_dir_name, cls.parent, cls.ModuleName, cls.PydName), Modified: trunk/python-ogre/demos/ogre/plugins.cfg =================================================================== --- trunk/python-ogre/demos/ogre/plugins.cfg 2007-12-31 07:21:40 UTC (rev 527) +++ trunk/python-ogre/demos/ogre/plugins.cfg 2008-01-06 05:41:58 UTC (rev 528) @@ -2,7 +2,7 @@ ## Use this for Windows # Define plugin folder -PluginFolder=/home/andy/development/root/usr/lib/OGRE +#PluginFolder=/Users/andy/development/python-ogre/demos/ogre/ #Plugin=RenderSystem_GL.dll #Plugin=RenderSystem_Direct3D9.dll #Plugin=Plugin_ParticleFX.dll @@ -13,7 +13,7 @@ ## ## NOTE use this for MacOS or Linux Plugin=RenderSystem_GL - Plugin=Plugin_ParticleFX - Plugin=Plugin_BSPSceneManager - Plugin=Plugin_OctreeSceneManager - Plugin=Plugin_CgProgramManager +# Plugin=Plugin_ParticleFX +# Plugin=Plugin_BSPSceneManager +# Plugin=Plugin_OctreeSceneManager +## Plugin=Plugin_CgProgramManager Modified: trunk/python-ogre/environment.py =================================================================== --- trunk/python-ogre/environment.py 2007-12-31 07:21:40 UTC (rev 527) +++ trunk/python-ogre/environment.py 2008-01-06 05:41:58 UTC (rev 528) @@ -134,7 +134,7 @@ mv = "mv " rm = "rm -f " cp = "cp -f " - unzip = "unzip " + unzip = "unzip -o " cvs = "cvs -z3 -q " svn = "svn --non-interactive " if isMac(): @@ -494,15 +494,15 @@ ] buildCmds = [ [0, tar + " jxf " + os.path.join(downloadPath,base)+".tar.bz2 --overwrite",os.getcwd() ], - [0, unzip + os.path.join(downloadPath,base)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ], + [0, unzip + os.path.join(downloadPath,basedep)+".zip ",os.path.join(os.getcwd(), 'ogrenew') ], [0, "mkdir ~/Library/Frameworks", ''], ## Note that this will fail if the directory exists !!! - [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOS','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''], + [0,cp + " -R "+os.path.join(os.getcwd(), 'ogrenew', '__MACOSX','Dependencies')+'/*.framework ' + Config.FRAMEWORK_DIR,''], [0, "patch -s -N -i ./python-ogre/patch/ogre.patch -p0 ", os.getcwd()], [0, "mkdir Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ], # need copies of these in an 'Ogre/..' directory due to includes in the OSX directory -- or get the framework right [0, "cp OgreRoot.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ], [0, "cp OgreRenderSystem.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ], - [0, "cp OgrePreRequisities.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ], + [0, "cp OgrePrerequisites.h Ogre",os.path.join(os.getcwd() ,'ogrenew','OgreMain', 'include') ], [0, "xcodebuild -project ogrenew/Mac/Ogre/Ogre.xcodeproj -configuration Release", ''], [0, "xcodebuild -project ogrenew/Mac/Samples/Samples.xcodeproj -configuration Release", ''], [0, "cp -R *.framework " + Config.FRAMEWORK_DIR, os.path.join(os.getcwd() ,'ogrenew',"Mac", "build", "Release") ] @@ -1074,7 +1074,8 @@ [0, "tar zxf " + os.path.join(downloadPath, "libvorbis-1.2.0.tar.gz"), ''], [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libogg-1.1.3")], [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "libvorbis-1.2.0")], - [0, "./autogen.sh\n./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")] + [0, "aclocal\n./autogen.sh", os.path.join(os.getcwd(),"openal-0.0.8")], + [0, "./configure --prefix=%s\nmake\nmake install" % PREFIX, os.path.join(os.getcwd(), "openal-0.0.8")] ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |