Commit: be047fe455b8a289b2ebc43af81374510c0b6a06 Author: Jörg Müller Date: Tue Jul 28 14:52:21 2015 +0200 Branches: master https://developer.blender.org/rBbe047fe455b8a289b2ebc43af81374510c0b6a06
Audaspace: building without audaspace. - Fixed building without for cmake. - Scons can now build without audaspace too. =================================================================== M SConstruct M intern/SConscript M source/blender/blenkernel/intern/sound.c =================================================================== diff --git a/SConstruct b/SConstruct index ea3d840..b55cca4 100644 --- a/SConstruct +++ b/SConstruct @@ -514,6 +514,10 @@ if env['WITH_BF_STATICCXX']: else: print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' +# audaspace is needed for the game engine +if not env['WITH_BF_AUDASPACE']: + env['WITH_BF_GAMEENGINE'] = False + # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline if 'blenderplayer' in B.targets: env['WITH_BF_PLAYER'] = True diff --git a/intern/SConscript b/intern/SConscript index a13f675..124afd4 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -27,8 +27,7 @@ Import ('env') -SConscript(['audaspace/SConscript', - 'string/SConscript', +SConscript(['string/SConscript', 'ghost/SConscript', 'glew-mx/SConscript', 'guardedalloc/SConscript', @@ -45,6 +44,9 @@ SConscript(['audaspace/SConscript', # currently only contains headers # SConscript('container/SConscript') +if env['WITH_BF_AUDASPACE']: + SConscript(['audaspace/SConscript']) + if env ['WITH_BF_REMESH']: SConscript(['dualcon/SConscript']) diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 0914986..88d1433 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -864,7 +864,7 @@ bool BKE_sound_is_jack_supported(void) #include "BLI_utildefines.h" -void BKE_sound_force_device(int UNUSED(device)) {} +void BKE_sound_force_device(const char *UNUSED(device)) {} void BKE_sound_init_once(void) {} void BKE_sound_init(struct Main *UNUSED(bmain)) {} void BKE_sound_exit(void) {} _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs