Made winmm a separate shared library.

This commit is contained in:
Alexandre Julliard 2000-02-26 13:45:34 +00:00
parent 0ee98cc39f
commit e1d78899ea
22 changed files with 34 additions and 10 deletions

View File

@ -126,6 +126,7 @@ DLLS = \
windebug \ windebug \
wineoss.drv \ wineoss.drv \
wing \ wing \
winmm \
winspool \ winspool \
wnaspi32 \ wnaspi32 \
wsock32 wsock32

View File

@ -35,7 +35,6 @@ LIBSUBDIRS = \
dlls/mpr \ dlls/mpr \
dlls/ntdll \ dlls/ntdll \
dlls/winaspi \ dlls/winaspi \
dlls/winmm \
files \ files \
graphics \ graphics \
graphics/enhmetafiledrv \ graphics/enhmetafiledrv \
@ -113,7 +112,6 @@ LIBOBJS = \
dlls/mpr/mpr.o \ dlls/mpr/mpr.o \
dlls/ntdll/ntdll.o \ dlls/ntdll/ntdll.o \
dlls/winaspi/winaspi.o \ dlls/winaspi/winaspi.o \
dlls/winmm/winmm.o \
files/files.o \ files/files.o \
graphics/graphics.o \ graphics/graphics.o \
graphics/enhmetafiledrv/enhmetafiledrv.o \ graphics/enhmetafiledrv/enhmetafiledrv.o \

View File

@ -37,6 +37,7 @@ DLLFILES = \
win87em/libwin87em.@LIBEXT@ \ win87em/libwin87em.@LIBEXT@ \
windebug/libwindebug.@LIBEXT@ \ windebug/libwindebug.@LIBEXT@ \
wing/libwing.@LIBEXT@ \ wing/libwing.@LIBEXT@ \
winmm/libwinmm.@LIBEXT@ \
winmm/joystick/libjoystick.drv.@LIBEXT@ \ winmm/joystick/libjoystick.drv.@LIBEXT@ \
winmm/mcianim/libmcianim.drv.@LIBEXT@ \ winmm/mcianim/libmcianim.drv.@LIBEXT@ \
winmm/mciavi/libmciavi.drv.@LIBEXT@ \ winmm/mciavi/libmciavi.drv.@LIBEXT@ \
@ -226,6 +227,10 @@ libwing.@LIBEXT@: wing/libwing.@LIBEXT@
$(RM) $@ $(RM) $@
$(LN_S) wing/libwing.@LIBEXT@ $@ $(LN_S) wing/libwing.@LIBEXT@ $@
libwinmm.@LIBEXT@: winmm/libwinmm.@LIBEXT@
$(RM) $@
$(LN_S) winmm/libwinmm.@LIBEXT@ $@
libwinspool.@LIBEXT@: winspool/libwinspool.@LIBEXT@ libwinspool.@LIBEXT@: winspool/libwinspool.@LIBEXT@
$(RM) $@ $(RM) $@
$(LN_S) winspool/libwinspool.@LIBEXT@ $@ $(LN_S) winspool/libwinspool.@LIBEXT@ $@

View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = avifil32 MODULE = avifil32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = msvfw32 IMPORTS = msvfw32 winmm
SPEC_SRCS = avifil32.spec avifile.spec SPEC_SRCS = avifil32.spec avifile.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = comctl32 MODULE = comctl32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
WRCEXTRA = -s -p$(MODULE) WRCEXTRA = -s -p$(MODULE)
SPEC_SRCS = comctl32.spec SPEC_SRCS = comctl32.spec

View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = comdlg32 MODULE = comdlg32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = shell32 ole32 comctl32 winspool IMPORTS = shell32 ole32 comctl32 winspool winmm
WRCEXTRA = -s -pcomdlg32 WRCEXTRA = -s -pcomdlg32
SPEC_SRCS = commdlg.spec comdlg32.spec SPEC_SRCS = commdlg.spec comdlg32.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = msvfw32 MODULE = msvfw32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = msvfw32.spec msvideo.spec SPEC_SRCS = msvfw32.spec msvideo.spec

View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = oleaut32 MODULE = oleaut32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = olepro32 ole32 comctl32 IMPORTS = olepro32 ole32 comctl32 winmm
SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec

View File

@ -6,7 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = shell32 MODULE = shell32
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = ole32 comctl32 IMPORTS = ole32 comctl32 winmm
WRCEXTRA = -s -p$(MODULE) WRCEXTRA = -s -p$(MODULE)
SPEC_SRCS = \ SPEC_SRCS = \

View File

@ -1,5 +1,6 @@
Makefile *.glue.c
*.spec.c *.spec.c
*.spec.glue.s *.spec.glue.s
*.glue.c Makefile
libwinmm.so.1.0
winmm_res.s winmm_res.s

View File

@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
LIBEXT = @LIBEXT@
MODULE = winmm MODULE = winmm
SOVERSION = 1.0
WRCEXTRA = -s -pwinmm WRCEXTRA = -s -pwinmm
SPEC_SRCS = \ SPEC_SRCS = \
@ -25,7 +27,7 @@ GLUE = lolvldrv.c \
RC_SRCS= \ RC_SRCS= \
winmm_res.rc winmm_res.rc
all: check_wrc $ $(MODULE).o all: check_wrc $ lib$(MODULE).$(LIBEXT)
SUBDIRS = \ SUBDIRS = \
joystick \ joystick \
@ -45,4 +47,7 @@ $(SUBDIRS): dummy
$(RC_SRCS:.rc=.s): $(WRC) $(RC_SRCS:.rc=.s): $(WRC)
clean::
$(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION)
### Dependencies: ### Dependencies:

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = joystick.drv MODULE = joystick.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
joystick.spec joystick.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = mcianim.drv MODULE = mcianim.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
mcianim.spec mcianim.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = mciavi.drv MODULE = mciavi.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
mciavi.spec mciavi.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = mcicda.drv MODULE = mcicda.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
mcicda.spec mcicda.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = mciseq.drv MODULE = mciseq.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
mciseq.spec mciseq.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = mciwave.drv MODULE = mciwave.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
mciwave.spec mciwave.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = midimap.drv MODULE = midimap.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
midimap.spec midimap.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = msacm.drv MODULE = msacm.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
msacm.spec msacm.spec

View File

@ -6,6 +6,7 @@ VPATH = @srcdir@
LIBEXT = @LIBEXT@ LIBEXT = @LIBEXT@
MODULE = wineoss.drv MODULE = wineoss.drv
SOVERSION = 1.0 SOVERSION = 1.0
IMPORTS = winmm
SPEC_SRCS = \ SPEC_SRCS = \
wineoss.spec wineoss.spec

View File

@ -12,6 +12,9 @@
/* Define if struct msghdr contains msg_accrights */ /* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS #undef HAVE_MSGHDR_ACCRIGHTS
/* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN
/* Define if you have the Xxf86dga library (-lXxf86dga). */ /* Define if you have the Xxf86dga library (-lXxf86dga). */
#undef HAVE_LIBXXF86DGA #undef HAVE_LIBXXF86DGA

View File

@ -53,7 +53,7 @@
/* Define if struct msghdr contains msg_accrights */ /* Define if struct msghdr contains msg_accrights */
#undef HAVE_MSGHDR_ACCRIGHTS #undef HAVE_MSGHDR_ACCRIGHTS
/* Define if struct sockaddr_un has the member sun_len */ /* Define if struct sockaddr_un contains sun_len */
#undef HAVE_SOCKADDR_SUN_LEN #undef HAVE_SOCKADDR_SUN_LEN
/* Define if you have the Xxf86dga library (-lXxf86dga). */ /* Define if you have the Xxf86dga library (-lXxf86dga). */