diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-02-18 18:59:20 +0300 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-02-18 18:59:20 +0300 |
| commit | b896a007ea2475e0b81985d996c75e1204d70137 (patch) | |
| tree | 55634c085b01f3991c10f48c3cd27bcd35309ebe | |
| parent | 007374170b46c3f677b3c39d1af9736f497d5811 (diff) | |
Scons fixes:
- Removing alut
- Minor changes in linux ffmpeg default config.
| -rw-r--r-- | SConstruct | 34 | ||||
| -rw-r--r-- | config/linux2-config.py | 5 |
2 files changed, 1 insertions, 38 deletions
diff --git a/SConstruct b/SConstruct index aa151e4e04c..6c404784ab0 100644 --- a/SConstruct +++ b/SConstruct @@ -244,40 +244,6 @@ if env.has_key('BF_DEBUG_LIBS'): 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: diff --git a/config/linux2-config.py b/config/linux2-config.py index ef5ff0d2b4d..53cad76d612 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -110,12 +110,9 @@ WITH_BF_BINRELOC = True # 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 |