forked from bartvdbraak/blender
scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore.
This commit is contained in:
parent
6ff74f4527
commit
15bce017df
12
SConstruct
12
SConstruct
@ -267,6 +267,18 @@ if 'blenderlite' in B.targets:
|
||||
env['WITH_BF_YAFRAY'] = False
|
||||
env['WITH_BF_REDCODE'] = False
|
||||
env['WITH_BF_FTGL'] = False
|
||||
env['WITH_BF_DDS'] = False
|
||||
env['WITH_BF_ZLIB'] = False
|
||||
env['WITH_BF_SDL'] = False
|
||||
env['WITH_BF_JPEG'] = False
|
||||
env['WITH_BF_PNG'] = False
|
||||
env['WITH_BF_ODE'] = False
|
||||
env['WITH_BF_BULLET'] = False
|
||||
env['WITH_BF_BINRELOC'] = False
|
||||
env['BF_BUILDINFO'] = False
|
||||
env['BF_NO_ELBEEM'] = True
|
||||
|
||||
|
||||
|
||||
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
|
||||
#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
|
||||
|
@ -43,7 +43,8 @@ if env['WITH_BF_QUICKTIME'] == 1:
|
||||
defs += ' WITH_QUICKTIME'
|
||||
incs += ' ' + env['BF_QUICKTIME_INC']
|
||||
|
||||
defs += ' WITH_CCGSUBSURF'
|
||||
if env['BF_NO_ELBEEM'] == 1:
|
||||
defs += ' DISABLE_ELBEEM'
|
||||
|
||||
if env['WITH_BF_PLAYER']:
|
||||
SConscript(['bad_level_call_stubs/SConscript'])
|
||||
|
@ -75,7 +75,13 @@ if env['WITH_BF_VERSE']:
|
||||
# TODO buildinfo
|
||||
if env['BF_BUILDINFO'] == 1:
|
||||
defs.append('NAN_BUILDINFO')
|
||||
|
||||
|
||||
if env['BF_NO_ELBEEM'] == 1:
|
||||
defs.append('DISABLE_ELBEEM')
|
||||
|
||||
if env['WITH_BF_SDL'] == 0:
|
||||
defs.append('DISABLE_SDL')
|
||||
|
||||
if (env['BF_SPLIT_SRC'] == 1) and (env['OURPLATFORM'] == 'win32-mingw'):
|
||||
for i in range(numlibs):
|
||||
env.BlenderLib ( libname = 'src%d' % (i), sources = subsources[i], includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )
|
||||
|
@ -27,6 +27,7 @@
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -118,6 +119,7 @@ void makewavstring (char *string)
|
||||
|
||||
void audio_mixdown()
|
||||
{
|
||||
#ifndef DISABLE_SDL
|
||||
int file, c, totlen, totframe, i, oldcfra;
|
||||
char *buf;
|
||||
|
||||
@ -203,6 +205,7 @@ void audio_mixdown()
|
||||
MEM_freeN(buf);
|
||||
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
|
||||
void audiostream_fill(Uint8 *mixdown, int len)
|
||||
@ -211,7 +214,7 @@ void audiostream_fill(Uint8 *mixdown, int len)
|
||||
int i;
|
||||
|
||||
memset(mixdown, 0, len);
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
for (i = 0; i < len; i += 64) {
|
||||
CFRA = (int) ( ((float)(audio_pos-64)
|
||||
/( G.scene->audio.mixrate*4 ))
|
||||
@ -222,6 +225,7 @@ void audiostream_fill(Uint8 *mixdown, int len)
|
||||
}
|
||||
|
||||
CFRA = oldcfra;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -288,6 +292,7 @@ void audio_makestream(bSound *sound)
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
static void audio_fill_ram_sound(Sequence *seq, void * mixdown,
|
||||
Uint8 * sstream, int len)
|
||||
{
|
||||
@ -318,7 +323,9 @@ static void audio_fill_ram_sound(Sequence *seq, void * mixdown,
|
||||
}
|
||||
seq->curpos += len;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
static void audio_fill_hd_sound(Sequence *seq,
|
||||
void * mixdown, Uint8 * sstream,
|
||||
int len)
|
||||
@ -354,7 +361,9 @@ static void audio_fill_hd_sound(Sequence *seq,
|
||||
}
|
||||
seq->curpos += len;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
static void audio_fill_seq(Sequence * seq, void * mixdown,
|
||||
Uint8 *sstream, int len, int advance_only)
|
||||
{
|
||||
@ -407,7 +416,9 @@ static void audio_fill_seq(Sequence * seq, void * mixdown,
|
||||
seq = seq->next;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
void audio_fill(void *mixdown, Uint8 *sstream, int len)
|
||||
{
|
||||
Editing *ed;
|
||||
@ -427,7 +438,9 @@ void audio_fill(void *mixdown, Uint8 *sstream, int len)
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_SDL
|
||||
static int audio_init(SDL_AudioSpec *desired)
|
||||
{
|
||||
SDL_AudioSpec *obtained, *hardware_spec;
|
||||
@ -452,6 +465,7 @@ static int audio_init(SDL_AudioSpec *desired)
|
||||
SDL_PauseAudio(0);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int audiostream_play_seq(Sequence * seq, Uint32 startframe)
|
||||
{
|
||||
@ -498,6 +512,7 @@ static int audiostream_play_seq(Sequence * seq, Uint32 startframe)
|
||||
|
||||
void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown)
|
||||
{
|
||||
#ifndef DISABLE_SDL
|
||||
static SDL_AudioSpec desired;
|
||||
Editing *ed;
|
||||
int have_sound = 0;
|
||||
@ -539,6 +554,7 @@ void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown)
|
||||
SDL_PauseAudio(0);
|
||||
audio_playing++;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void audiostream_start(Uint32 frame)
|
||||
@ -553,8 +569,10 @@ void audiostream_scrub(Uint32 frame)
|
||||
|
||||
void audiostream_stop(void)
|
||||
{
|
||||
#ifndef DISABLE_SDL
|
||||
SDL_PauseAudio(1);
|
||||
audio_playing=0;
|
||||
#endif
|
||||
}
|
||||
|
||||
int audiostream_pos(void)
|
||||
|
@ -111,15 +111,16 @@ def setup_staticlibs(lenv):
|
||||
'/usr/lib',
|
||||
lenv['BF_PYTHON_LIBPATH'],
|
||||
lenv['BF_OPENGL_LIBPATH'],
|
||||
lenv['BF_SDL_LIBPATH'],
|
||||
lenv['BF_JPEG_LIBPATH'],
|
||||
lenv['BF_PNG_LIBPATH'],
|
||||
lenv['BF_ZLIB_LIBPATH'],
|
||||
lenv['BF_ICONV_LIBPATH']
|
||||
]
|
||||
|
||||
|
||||
libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
|
||||
|
||||
if lenv['WITH_BF_SDL']:
|
||||
libincs += Split(lenv['BF_SDL_LIBPATH'])
|
||||
if lenv['WITH_BF_FFMPEG']:
|
||||
libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
|
||||
if lenv['WITH_BF_STATICCXX']:
|
||||
statlibs += Split(lenv['BF_CXX_LIB_STATIC'])
|
||||
if lenv['WITH_BF_OPENEXR']:
|
||||
@ -172,7 +173,8 @@ def setup_syslibs(lenv):
|
||||
syslibs += Split(lenv['BF_OPENEXR_LIB'])
|
||||
if lenv['WITH_BF_FFMPEG']:
|
||||
syslibs += Split(lenv['BF_FFMPEG_LIB'])
|
||||
syslibs += Split(lenv['BF_SDL_LIB'])
|
||||
if lenv['WITH_BF_SDL']:
|
||||
syslibs += Split(lenv['BF_SDL_LIB'])
|
||||
if not lenv['WITH_BF_STATICOPENGL']:
|
||||
syslibs += Split(lenv['BF_OPENGL_LIB'])
|
||||
if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'):
|
||||
|
Loading…
Reference in New Issue
Block a user