Audaspace: building without audaspace.

- Fixed building without for cmake.
- Scons can now build without audaspace too.

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

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'])
 

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) {}