x3daudio1_5: Use shared source.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrew Eikum 2016-01-14 11:38:26 -06:00 committed by Alexandre Julliard
parent 76af4bdd7b
commit b65465f331
5 changed files with 7 additions and 40 deletions

1
configure vendored
View File

@ -13719,6 +13719,7 @@ fi
if test "x$ac_cv_have_openalsoft" != xyes if test "x$ac_cv_have_openalsoft" != xyes
then then
as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" 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_6=${enable_x3daudio1_6:-no}
enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no}
enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_1=${enable_xapofx1_1:-no}

View File

@ -1662,6 +1662,7 @@ fi
if test "x$ac_cv_have_openalsoft" != xyes if test "x$ac_cv_have_openalsoft" != xyes
then then
WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) 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_6=${enable_x3daudio1_6:-no}
enable_x3daudio1_7=${enable_x3daudio1_7:-no} enable_x3daudio1_7=${enable_x3daudio1_7:-no}
enable_xapofx1_1=${enable_xapofx1_1:-no} enable_xapofx1_1=${enable_xapofx1_1:-no}

View File

@ -1,4 +1,6 @@
EXTRADEFS = -DX3DAUDIO1_VER=5 -DXAUDIO2_VER=5
MODULE = x3daudio1_5.dll MODULE = x3daudio1_5.dll
PARENTSRC = ../xaudio2_7
C_SRCS = \ C_SRCS = \
main.c x3daudio.c

View File

@ -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;
}

View File

@ -1,2 +1,2 @@
@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) xaudio2_8.X3DAudioCalculate @ cdecl X3DAudioCalculate(ptr ptr ptr long ptr)
@ cdecl X3DAudioInitialize(long float ptr) x3daudio1_7.X3DAudioInitialize @ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize