x3daudio1_5: Use shared source.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

diff --git a/configure b/configure
index e87d3060e600f822d21e8c76f4db344c585dc608..09c3704d489587727f1703dbbe405e558df3ba35 100755 (executable)
--- a/configure
+++ b/configure
@@ -13719,6 +13719,7 @@ fi
 if test "x$ac_cv_have_openalsoft" != xyes
 then
     as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported"
+    enable_x3daudio1_5=${enable_x3daudio1_5:-no}
     enable_x3daudio1_6=${enable_x3daudio1_6:-no}
     enable_x3daudio1_7=${enable_x3daudio1_7:-no}
     enable_xapofx1_1=${enable_xapofx1_1:-no}

diff --git a/configure.ac b/configure.ac
index 8ef64f5f254cd264d775c90ef898140f37247c98..9ba281810386bfe9e8657e66594ee5e8f6035ef3 100644 (file)
--- 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_5=${enable_x3daudio1_5:-no}
     enable_x3daudio1_6=${enable_x3daudio1_6:-no}
     enable_x3daudio1_7=${enable_x3daudio1_7:-no}
     enable_xapofx1_1=${enable_xapofx1_1:-no}

diff --git a/dlls/x3daudio1_5/Makefile.in b/dlls/x3daudio1_5/Makefile.in
index 42a7f614284b2399bf5b2e9ab6e5eaf93eada9c1..dac67aef76d0bf83d128784800f7e8ce88edeea4 100644 (file)
--- a/dlls/x3daudio1_5/Makefile.in
+++ b/dlls/x3daudio1_5/Makefile.in
@@ -1,4 +1,6 @@
+EXTRADEFS = -DX3DAUDIO1_VER=5 -DXAUDIO2_VER=5
 MODULE    = x3daudio1_5.dll
+PARENTSRC = ../xaudio2_7
 
 C_SRCS = \
-       main.c
+       x3daudio.c

diff --git a/dlls/x3daudio1_5/main.c b/dlls/x3daudio1_5/main.c
deleted file mode 100644 (file)
index debb65c..0000000
--- a/dlls/x3daudio1_5/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_5/x3daudio1_5.spec b/dlls/x3daudio1_5/x3daudio1_5.spec
index 30da23c0213e0b45b1743acf7abd31d9ebc45ea4..0d6caa0ccfafe9939bdaa2c15b395801a25208d7 100644 (file)
--- a/dlls/x3daudio1_5/x3daudio1_5.spec
+++ b/dlls/x3daudio1_5/x3daudio1_5.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