[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16604] trunk/blender: scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore.
Campbell Barton
ideasman42 at gmail.com
Fri Sep 19 03:39:36 CEST 2008
Revision: 16604
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16604
Author: campbellbarton
Date: 2008-09-19 03:39:34 +0200 (Fri, 19 Sep 2008)
Log Message:
-----------
scons update, BF_NO_ELBEEM wasnt working, WITH_BF_SDL wasnt implimented, WITH_CCGSUBSURF isnt used anymore.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/src/SConscript
trunk/blender/source/blender/src/seqaudio.c
trunk/blender/tools/Blender.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-09-18 22:33:49 UTC (rev 16603)
+++ trunk/blender/SConstruct 2008-09-19 01:39:34 UTC (rev 16604)
@@ -267,7 +267,19 @@
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)
B.root_build_dir = env['BF_BUILDDIR']
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2008-09-18 22:33:49 UTC (rev 16603)
+++ trunk/blender/source/blender/blenkernel/SConscript 2008-09-19 01:39:34 UTC (rev 16604)
@@ -43,7 +43,8 @@
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'])
Modified: trunk/blender/source/blender/src/SConscript
===================================================================
--- trunk/blender/source/blender/src/SConscript 2008-09-18 22:33:49 UTC (rev 16603)
+++ trunk/blender/source/blender/src/SConscript 2008-09-19 01:39:34 UTC (rev 16604)
@@ -75,7 +75,13 @@
# 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] )
Modified: trunk/blender/source/blender/src/seqaudio.c
===================================================================
--- trunk/blender/source/blender/src/seqaudio.c 2008-09-18 22:33:49 UTC (rev 16603)
+++ trunk/blender/source/blender/src/seqaudio.c 2008-09-19 01:39:34 UTC (rev 16604)
@@ -27,6 +27,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
+
#include <math.h>
#include <stdlib.h>
#include <string.h>
@@ -118,6 +119,7 @@
void audio_mixdown()
{
+#ifndef DISABLE_SDL
int file, c, totlen, totframe, i, oldcfra;
char *buf;
@@ -203,6 +205,7 @@
MEM_freeN(buf);
return;
+#endif
}
void audiostream_fill(Uint8 *mixdown, int len)
@@ -211,7 +214,7 @@
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 @@
}
CFRA = oldcfra;
+#endif
}
@@ -288,6 +292,7 @@
}
}
+#ifndef DISABLE_SDL
static void audio_fill_ram_sound(Sequence *seq, void * mixdown,
Uint8 * sstream, int len)
{
@@ -318,7 +323,9 @@
}
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 @@
}
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 @@
seq = seq->next;
}
}
+#endif
+#ifndef DISABLE_SDL
void audio_fill(void *mixdown, Uint8 *sstream, int len)
{
Editing *ed;
@@ -427,7 +438,9 @@
}
}
}
+#endif
+#ifndef DISABLE_SDL
static int audio_init(SDL_AudioSpec *desired)
{
SDL_AudioSpec *obtained, *hardware_spec;
@@ -452,6 +465,7 @@
SDL_PauseAudio(0);
return 1;
}
+#endif
static int audiostream_play_seq(Sequence * seq, Uint32 startframe)
{
@@ -498,6 +512,7 @@
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 @@
SDL_PauseAudio(0);
audio_playing++;
}
+#endif
}
void audiostream_start(Uint32 frame)
@@ -553,8 +569,10 @@
void audiostream_stop(void)
{
+#ifndef DISABLE_SDL
SDL_PauseAudio(1);
audio_playing=0;
+#endif
}
int audiostream_pos(void)
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2008-09-18 22:33:49 UTC (rev 16603)
+++ trunk/blender/tools/Blender.py 2008-09-19 01:39:34 UTC (rev 16604)
@@ -111,15 +111,16 @@
'/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 @@
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'):
More information about the Bf-blender-cvs
mailing list