Audaspace: fixing problems for the merge to master suggested by Campbell and Sergey.

- rename WITH_EXTERNAL_AUDASPACE to WITH_SYSTEM_AUDASPACE.
- rename C/PYAUDASPACE to AUDASPACE_C/PY
- simplifying cmake defines and includes.
- fixing include paths and enabling WITH_SYSTEM_AUDASPACE for windows.
- fixing scons building.
- other minor build system fixes.

3 files changed, 10 insertions, 6 deletions

diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index 7c6335166ec..7fecb1a48a7 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -21,15 +21,15 @@
 
 remove_extra_strict_flags()
 
-if(WITH_EXTERNAL_AUDASPACE)
+if(WITH_SYSTEM_AUDASPACE)
 
 	set(INC
 		.
 	)
 
 	set(INC_SYS
-		${CAUDASPACE_INCLUDE_DIRS}
-		${PYAUDASPACE_INCLUDE_DIRS}
+		${AUDASPACE_C_INCLUDE_DIRS}
+		${AUDASPACE_PY_INCLUDE_DIRS}
 	)
 
 	set(SRC
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index cc338629c85..2975545f2b6 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -24,6 +24,10 @@
 Import ('env')
 
 sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp')
+
+# AUD_PyInit is for external audaspace only
+sources.remove('intern/AUD_PyInit.cpp')
+
 incs = '. intern FX ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_BOOST_INC']
 defs = []
 
diff --git a/intern/audaspace/intern/AUD_PyInit.cpp b/intern/audaspace/intern/AUD_PyInit.cpp
index 5e89d88c68f..4e27c31b838 100644
--- a/intern/audaspace/intern/AUD_PyInit.cpp
+++ b/intern/audaspace/intern/AUD_PyInit.cpp
@@ -28,9 +28,9 @@
 
 #include "AUD_PyInit.h"
 
-#include <audaspace/AUD_Sound.h>
-#include <audaspace/python/PySound.h>
-#include <audaspace/python/PyAPI.h>
+#include <AUD_Sound.h>
+#include <python/PySound.h>
+#include <python/PyAPI.h>
 
 extern "C" {
 extern void *BKE_sound_get_factory(void *sound);