Commit b0530a5f authored by Alexandre Julliard's avatar Alexandre Julliard

winmm: Make sound.drv into a stand-alone 16-bit module.

parent e475ef89
...@@ -86,7 +86,6 @@ dlls/rpcrt4/tests/server_s.c ...@@ -86,7 +86,6 @@ dlls/rpcrt4/tests/server_s.c
dlls/setupx.dll16 dlls/setupx.dll16
dlls/shdocvw/shdocvw_v1.tlb dlls/shdocvw/shdocvw_v1.tlb
dlls/shell.dll16 dlls/shell.dll16
dlls/sound.drv16
dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole2.tlb/std_ole_v2.tlb
dlls/stdole32.tlb/std_ole_v1.tlb dlls/stdole32.tlb/std_ole_v1.tlb
dlls/system.drv16 dlls/system.drv16
......
...@@ -27128,6 +27128,14 @@ dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules" ...@@ -27128,6 +27128,14 @@ dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/softpub/Makefile" ac_config_files="$ac_config_files dlls/softpub/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/sound.drv16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
sound.drv16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/sound.drv16/Makefile: dlls/sound.drv16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/sound.drv16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/spoolss/Makefile" dlls/spoolss/Makefile"
test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_spoolss" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
spoolss" spoolss"
...@@ -29374,6 +29382,7 @@ do ...@@ -29374,6 +29382,7 @@ do
"dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;; "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;;
"dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;; "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;;
"dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;; "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;;
"dlls/sound.drv16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sound.drv16/Makefile" ;;
"dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;; "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;;
"dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;; "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;;
"dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;; "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;;
......
...@@ -2205,6 +2205,7 @@ WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI ...@@ -2205,6 +2205,7 @@ WINE_CONFIG_MAKEFILE([dlls/slc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI
WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/snmpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/snmpapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/softpub/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/sound.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/spoolss/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
......
...@@ -27,7 +27,6 @@ WIN16_FILES = \ ...@@ -27,7 +27,6 @@ WIN16_FILES = \
msvideo.dll16 \ msvideo.dll16 \
setupx.dll16 \ setupx.dll16 \
shell.dll16 \ shell.dll16 \
sound.drv16 \
system.drv16 \ system.drv16 \
toolhelp.dll16 \ toolhelp.dll16 \
user.exe16 \ user.exe16 \
...@@ -84,7 +83,7 @@ wprocs.dll16: ...@@ -84,7 +83,7 @@ wprocs.dll16:
wineps16.drv16: wineps16.drv16:
echo "wineps.drv" >$@ echo "wineps.drv" >$@
mmsystem.dll16 sound.drv16: mmsystem.dll16:
echo "winmm.dll" >$@ echo "winmm.dll" >$@
winnls.dll16: winnls.dll16:
......
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = sound.drv16
IMPORTS = kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,winmm.dll
SPEC_SRCS = sound.drv16.spec
C_SRCS = sound.c
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend
...@@ -19,12 +19,10 @@ C_SRCS = \ ...@@ -19,12 +19,10 @@ C_SRCS = \
C_SRCS16 = \ C_SRCS16 = \
message16.c \ message16.c \
mmsystem.c \ mmsystem.c
sound16.c
SPEC_SRCS16 = \ SPEC_SRCS16 = \
mmsystem.spec \ mmsystem.spec
sound.drv.spec
RC_SRCS = winmm_res.rc RC_SRCS = winmm_res.rc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment