[PATCH 2/3] xaudio2_7: Move source to shared xaudio2 directory

[Andrew Eikum]

Currently, all of Wine's xaudio2 modules forward their implementations
to xaudio2_7. This fails when the user installs native xaudio2_7 and
tries to use a built-in xaudio DLL like xaudio2_8. Instead, we should
use the shared source mechanism to build each xaudio DLL independent
of the others.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---

This is the first patch in a long series to move all 22 xaudio DLLs to
use shared source. These first two show the idea; the following
patches move all xaudio2_* DLLs, then xapofx1_*, then x3daudio1_*.
Next, there are a few cleanup patches to remove the run-time version
logic, since we can now do it at compile-time.

 dlls/{xaudio2_7 => xaudio2}/compat.c           | 0
 dlls/{xaudio2_7 => xaudio2}/xapofx.c           | 0
 dlls/{xaudio2_7 => xaudio2}/xaudio_classes.idl | 0
 dlls/{xaudio2_7 => xaudio2}/xaudio_dll.c       | 0
 dlls/{xaudio2_7 => xaudio2}/xaudio_private.h   | 0
 dlls/xaudio2_7/Makefile.in                     | 2 ++
 6 files changed, 2 insertions(+)
 rename dlls/{xaudio2_7 => xaudio2}/compat.c (100%)
 rename dlls/{xaudio2_7 => xaudio2}/xapofx.c (100%)
 rename dlls/{xaudio2_7 => xaudio2}/xaudio_classes.idl (100%)
 rename dlls/{xaudio2_7 => xaudio2}/xaudio_dll.c (100%)
 rename dlls/{xaudio2_7 => xaudio2}/xaudio_private.h (100%)

diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2/compat.c
similarity index 100%
rename from dlls/xaudio2_7/compat.c
rename to dlls/xaudio2/compat.c
diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2/xapofx.c
similarity index 100%
rename from dlls/xaudio2_7/xapofx.c
rename to dlls/xaudio2/xapofx.c
diff --git a/dlls/xaudio2_7/xaudio_classes.idl b/dlls/xaudio2/xaudio_classes.idl
similarity index 100%
rename from dlls/xaudio2_7/xaudio_classes.idl
rename to dlls/xaudio2/xaudio_classes.idl
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2/xaudio_dll.c
similarity index 100%
rename from dlls/xaudio2_7/xaudio_dll.c
rename to dlls/xaudio2/xaudio_dll.c
diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2/xaudio_private.h
similarity index 100%
rename from dlls/xaudio2_7/xaudio_private.h
rename to dlls/xaudio2/xaudio_private.h
diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in
index c403a61..467967a 100644
--- a/dlls/xaudio2_7/Makefile.in
+++ b/dlls/xaudio2_7/Makefile.in
@@ -1,6 +1,8 @@
+EXTRADEFS = -DXAUDIO2_VER=7
 MODULE    = xaudio2_7.dll
 IMPORTS   = advapi32 kernel32 ole32 user32 uuid
 EXTRALIBS = $(OPENAL_LIBS)
+PARENTSRC = ../xaudio2
 
 C_SRCS = \
 	compat.c \
-- 
2.7.0