[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27012] trunk/blender: Scons fixes:

[Joerg Mueller]

Revision: 27012
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27012
Author:   nexyon
Date:     2010-02-18 16:59:20 +0100 (Thu, 18 Feb 2010)

Log Message:
-----------
Scons fixes:
- Removing alut
- Minor changes in linux ffmpeg default config.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/linux2-config.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-18 14:37:17 UTC (rev 27011)
+++ trunk/blender/SConstruct	2010-02-18 15:59:20 UTC (rev 27012)
@@ -244,40 +244,6 @@
 
 printdebug = B.arguments.get('BF_LISTDEBUG', 0)
 
-# see if this linux distro has libalut
-
-if env['OURPLATFORM'] == 'linux2' :
-	if env['WITH_BF_OPENAL']:
-		mylib_test_source_file = """
-		#include "AL/alut.h"
-		int main(int argc, char **argv)
-		{
-			alutGetMajorVersion();
-			return 0;
-		}
-		"""
-
-		def CheckFreeAlut(context,env):
-			context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
-			env['LIBS'] = 'alut'
-			result = context.TryLink(mylib_test_source_file, '.c')
-			context.Result(result)
-			return result
-
-		env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
-		sconf_temp = mkdtemp()
-		conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
-		if conf.CheckFreeAlut( env2 ):
-			env['BF_OPENAL_LIB'] += ' alut'
-		del env2
-		root = ''
-		for root, dirs, files in os.walk(sconf_temp, topdown=False):
-			for name in files:
-				os.remove(os.path.join(root, name))
-			for name in dirs:
-				os.rmdir(os.path.join(root, name))
-		if root: os.rmdir(root)
-
 if len(B.quickdebug) > 0 and printdebug != 0:
 	print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
 	for l in B.quickdebug:

Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py	2010-02-18 14:37:17 UTC (rev 27011)
+++ trunk/blender/config/linux2-config.py	2010-02-18 15:59:20 UTC (rev 27012)
@@ -110,12 +110,9 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
-# BF_FFMPEG = '#extern/ffmpeg'
-# BF_FFMPEG_LIB = ''
-# Uncomment the following two lines to use system's ffmpeg
 BF_FFMPEG = '/usr'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
-BF_FFMPEG_INC = '${BF_FFMPEG}'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg