archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Useless final sound system branch update.

Browse Source
This commit is contained in:
Joerg Mueller
2009-08-11 20:48:19 +00:00
parent 88beab2cce
commit f750a68a26
7 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/linux2-config.py
View File

@@ -14,7 +14,7 @@ BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
BF_OPENAL = '/usr'
BF_OPENAL_INC = '${BF_OPENAL}/include/AL'
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'

2
config/win32-mingw-config.py
View File

@@ -21,7 +21,7 @@ BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'wrap_oal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = True
WITH_BF_FFMPEG = False
BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include'

2
config/win64-vc-config.py
View File

@@ -2,7 +2,7 @@ LCGDIR = '#../lib/win64'
LIBDIR = '${LCGDIR}'
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
WITH_BF_FFMPEG = False # -DWITH_FFMPEG
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'

1
source/blender/blenkernel/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ SET(INC
../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/smoke/extern
../../../intern/bsp/extern
../../../intern/audaspace
${SDL_INC}
${ZLIB_INC}
)

2
source/blender/blenloader/intern/writefile.c
View File

@@ -2140,8 +2140,6 @@ static void write_sounds(WriteData *wd, ListBase *idbase)
PackedFile * pf;
// set all samples to unsaved status
sound= idbase->first;
while(sound) {
if(sound->id.us>0 || wd->current) {

2
source/blender/editors/space_file/filelist.c
View File

@@ -848,6 +848,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
|| BLI_testextensie(file->relname, ".ac3")
|| BLI_testextensie(file->relname, ".aac")
|| BLI_testextensie(file->relname, ".flac")
|| BLI_testextensie(file->relname, ".wma")
|| BLI_testextensie(file->relname, ".eac3")) {
file->flags |= SOUNDFILE;
}
@@ -891,6 +892,7 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
|| BLI_testextensie(file->relname, ".ac3")
|| BLI_testextensie(file->relname, ".aac")
|| BLI_testextensie(file->relname, ".flac")
|| BLI_testextensie(file->relname, ".wma")
|| BLI_testextensie(file->relname, ".eac3")) {
file->flags |= SOUNDFILE;
}

1
tools/Blender.py
View File

@@ -198,6 +198,7 @@ def setup_syslibs(lenv):
if lenv['WITH_BF_LCMS']:
syslibs.append(lenv['BF_LCMS_LIB'])
syslibs += lenv['LLIBS']
return syslibs