ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemp3.acm: Rename to l3codeca.acm. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2017-10-12 09:19:12 -05:00 committed by Alexandre Julliard
parent 8b6eada458
commit bcc8791bc1
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1277,6 +1277,7 @@ enable_kernel32
enable_kernelbase enable_kernelbase
enable_ksuser enable_ksuser
enable_ktmw32 enable_ktmw32
enable_l3codeca_acm
enable_loadperf enable_loadperf
enable_localspl enable_localspl
enable_localui enable_localui
@ -1508,7 +1509,6 @@ enable_winehid_sys
enable_winejoystick_drv enable_winejoystick_drv
enable_winemac_drv enable_winemac_drv
enable_winemapi enable_winemapi
enable_winemp3_acm
enable_wineoss_drv enable_wineoss_drv
enable_wineps_drv enable_wineps_drv
enable_winepulse_drv enable_winepulse_drv
@ -14128,7 +14128,7 @@ if test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_Co
*) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported. *) as_fn_error $? "libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.
This is an error since --with-mpg123 was requested." "$LINENO" 5 ;; This is an error since --with-mpg123 was requested." "$LINENO" 5 ;;
esac esac
enable_winemp3_acm=${enable_winemp3_acm:-no} enable_l3codeca_acm=${enable_l3codeca_acm:-no}
fi fi
if test "$ac_cv_header_AL_al_h" = "yes" if test "$ac_cv_header_AL_al_h" = "yes"
@ -18456,6 +18456,7 @@ wine_fn_config_dll keyboard.drv16 enable_win16
wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel
wine_fn_config_dll ksuser enable_ksuser wine_fn_config_dll ksuser enable_ksuser
wine_fn_config_dll ktmw32 enable_ktmw32 wine_fn_config_dll ktmw32 enable_ktmw32
wine_fn_config_dll l3codeca.acm enable_l3codeca_acm
wine_fn_config_dll loadperf enable_loadperf implib wine_fn_config_dll loadperf enable_loadperf implib
wine_fn_config_dll localspl enable_localspl clean wine_fn_config_dll localspl enable_localspl clean
wine_fn_config_test dlls/localspl/tests localspl_test wine_fn_config_test dlls/localspl/tests localspl_test
@ -18826,7 +18827,6 @@ wine_fn_config_dll winehid.sys enable_winehid_sys
wine_fn_config_dll winejoystick.drv enable_winejoystick_drv wine_fn_config_dll winejoystick.drv enable_winejoystick_drv
wine_fn_config_dll winemac.drv enable_winemac_drv clean wine_fn_config_dll winemac.drv enable_winemac_drv clean
wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemapi enable_winemapi
wine_fn_config_dll winemp3.acm enable_winemp3_acm
wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineoss.drv enable_wineoss_drv
wine_fn_config_dll wineps.drv enable_wineps_drv clean wine_fn_config_dll wineps.drv enable_wineps_drv clean
wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineps16.drv16 enable_win16

4
configure.ac
View File

@ -1684,7 +1684,7 @@ then
fi fi
WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes], WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes -a x"$ac_cv_header_CoreAudio_CoreAudio_h" != xyes],
[libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.], [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.],
[enable_winemp3_acm]) [enable_l3codeca_acm])
dnl **** Check for OpenAL 1.1 **** dnl **** Check for OpenAL 1.1 ****
if test "$ac_cv_header_AL_al_h" = "yes" if test "$ac_cv_header_AL_al_h" = "yes"
@ -3220,6 +3220,7 @@ WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
WINE_CONFIG_DLL(ksuser) WINE_CONFIG_DLL(ksuser)
WINE_CONFIG_DLL(ktmw32) WINE_CONFIG_DLL(ktmw32)
WINE_CONFIG_DLL(l3codeca.acm)
WINE_CONFIG_DLL(loadperf,,[implib]) WINE_CONFIG_DLL(loadperf,,[implib])
WINE_CONFIG_DLL(localspl,,[clean]) WINE_CONFIG_DLL(localspl,,[clean])
WINE_CONFIG_TEST(dlls/localspl/tests) WINE_CONFIG_TEST(dlls/localspl/tests)
@ -3590,7 +3591,6 @@ WINE_CONFIG_DLL(winehid.sys)
WINE_CONFIG_DLL(winejoystick.drv) WINE_CONFIG_DLL(winejoystick.drv)
WINE_CONFIG_DLL(winemac.drv,,[clean]) WINE_CONFIG_DLL(winemac.drv,,[clean])
WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemapi)
WINE_CONFIG_DLL(winemp3.acm)
WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineoss.drv)
WINE_CONFIG_DLL(wineps.drv,,[clean]) WINE_CONFIG_DLL(wineps.drv,,[clean])
WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineps16.drv16,enable_win16)

2
dlls/winemp3.acm/Makefile.in → dlls/l3codeca.acm/Makefile.in
View File

@ -1,4 +1,4 @@
MODULE = winemp3.acm MODULE = l3codeca.acm
IMPORTS = winmm user32 IMPORTS = winmm user32
EXTRAINCL = $(MPG123_CFLAGS) EXTRAINCL = $(MPG123_CFLAGS)
EXTRALIBS = $(MPG123_LIBS) $(COREAUDIO_LIBS) EXTRALIBS = $(MPG123_LIBS) $(COREAUDIO_LIBS)

0
dlls/winemp3.acm/winemp3.acm.spec → dlls/l3codeca.acm/l3codeca.acm.spec
View File

0
dlls/winemp3.acm/mpegl3.c → dlls/l3codeca.acm/mpegl3.c
View File

2
loader/wine.inf.in
View File

@ -2635,7 +2635,7 @@ system.ini, mci,,"waveaudio=mciwave.dll"
system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm" system.ini, drivers32,,"msacm.imaadpcm=imaadp32.acm"
system.ini, drivers32,,"msacm.msadpcm=msadp32.acm" system.ini, drivers32,,"msacm.msadpcm=msadp32.acm"
system.ini, drivers32,,"msacm.msg711=msg711.acm" system.ini, drivers32,,"msacm.msg711=msg711.acm"
system.ini, drivers32,,"msacm.winemp3=winemp3.acm" system.ini, drivers32,,"msacm.l3acm=l3codeca.acm"
system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm" system.ini, drivers32,,"msacm.msgsm610=msgsm32.acm"
system.ini, drivers32,,"vidc.mrle=msrle32.dll" system.ini, drivers32,,"vidc.mrle=msrle32.dll"
system.ini, drivers32,,"vidc.msvc=msvidc32.dll" system.ini, drivers32,,"vidc.msvc=msvidc32.dll"

2
programs/winecfg/libraries.c
View File

@ -57,6 +57,7 @@ static const char * const builtin_only[] =
"icmp", "icmp",
"iphlpapi", "iphlpapi",
"kernel32", "kernel32",
"l3codeca.acm",
"mountmgr.sys", "mountmgr.sys",
"mswsock", "mswsock",
"ntdll", "ntdll",
@ -70,7 +71,6 @@ static const char * const builtin_only[] =
"w32skrnl", "w32skrnl",
"wined3d", "wined3d",
"winedos", "winedos",
"winemp3.acm",
"wineps", "wineps",
"winmm", "winmm",
"wintab32", "wintab32",

2
tools/winapi/win32.api
View File

@ -5760,7 +5760,7 @@ UINT
DWORD_PTR DWORD_PTR
%%winemp3.acm %%l3codeca.acm
%long %long