[PATCH 4/8] x3daudio1_4: Use shared source

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
 configure.ac                      |  1 +
 dlls/x3daudio1_4/Makefile.in      |  5 ++++-
 dlls/x3daudio1_4/main.c           | 37 -------------------------------------
 dlls/x3daudio1_4/x3daudio1_4.spec |  4 ++--
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 dlls/x3daudio1_4/main.c

diff --git a/configure.ac b/configure.ac
index 9ba2818..5477fcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1662,6 +1662,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported])
+    enable_x3daudio1_4=${enable_x3daudio1_4:-no}
     enable_x3daudio1_5=${enable_x3daudio1_5:-no}
     enable_x3daudio1_6=${enable_x3daudio1_6:-no}
     enable_x3daudio1_7=${enable_x3daudio1_7:-no}
diff --git a/dlls/x3daudio1_4/Makefile.in b/dlls/x3daudio1_4/Makefile.in
index e116f84..22ac9e9 100644
--- a/dlls/x3daudio1_4/Makefile.in
+++ b/dlls/x3daudio1_4/Makefile.in
@@ -1,4 +1,7 @@
+EXTRADEFS = -DX3DAUDIO1_VER=4 -DXAUDIO2_VER=4
 MODULE    = x3daudio1_4.dll
+IMPORTS   = kernel32
+PARENTSRC = ../xaudio2_7
 
 C_SRCS = \
-	main.c
+	x3daudio.c
diff --git a/dlls/x3daudio1_4/main.c b/dlls/x3daudio1_4/main.c
deleted file mode 100644
index debb65c..0000000
--- a/dlls/x3daudio1_4/main.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2015 Andrey Gusev
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(instance);
-            break;
-    }
-
-    return TRUE;
-}
diff --git a/dlls/x3daudio1_4/x3daudio1_4.spec b/dlls/x3daudio1_4/x3daudio1_4.spec
index 30da23c..0d6caa0 100644
--- a/dlls/x3daudio1_4/x3daudio1_4.spec
+++ b/dlls/x3daudio1_4/x3daudio1_4.spec
@@ -1,2 +1,2 @@
-@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate
-@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize
+@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
+@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize
-- 
2.7.0