diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | intern/SConscript | 6 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index ea3d840aaed..b55cca403e9 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 a13f67537ac..124afd4bbb9 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 091498653e6..88d14333fb2 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) {} |