Skip to content

W
wine-winehq
Commit 68944c20 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

Split the multimedia/ directory into dlls/ subdirectories.

parent 6ae75a1a
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 70 deletions
Makefile.in
View file @ 68944c20
......@@ -37,6 +37,7 @@ LIBSUBDIRS = \
dlls/crtdll \
dlls/dciman32 \
dlls/dplayx \
dlls/dsound \
dlls/imagehlp \
dlls/imm32 \
dlls/lzexpand \
......@@ -63,9 +64,14 @@ LIBSUBDIRS = \
dlls/win87em \
dlls/winaspi \
dlls/windebug \
dlls/wing \
dlls/winmm \
dlls/winmm/mcianim \
dlls/winmm/mciavi \
dlls/winmm/mcicda \
dlls/winmm/mciseq \
dlls/winmm/mciwave \
dlls/winmm/wineoss \
dlls/wing \
dlls/winspool \
dlls/wnaspi32 \
files \
......@@ -83,7 +89,6 @@ LIBSUBDIRS = \
memory \
misc \
msdos \
multimedia \
objects \
ole \
relay32 \
......@@ -137,6 +142,7 @@ LIBOBJS = \
dlls/crtdll/crtdll.o \
dlls/dciman32/dciman32.o \
dlls/dplayx/dplayx.o \
dlls/dsound/dsound.o \
dlls/imagehlp/imagehlp.o \
dlls/imm32/imm32.o \
dlls/lzexpand/lzexpand.o \
......@@ -163,8 +169,14 @@ LIBOBJS = \
dlls/win87em/win87em.o \
dlls/winaspi/winaspi.o \
dlls/windebug/windebug.o \
dlls/winmm/wineoss/wineoss.o \
dlls/wing/wing.o \
dlls/winmm/mcianim/mcianim.drv.o \
dlls/winmm/mciavi/mciavi.drv.o \
dlls/winmm/mcicda/mcicda.drv.o \
dlls/winmm/mciseq/mciseq.drv.o \
dlls/winmm/mciwave/mciwave.drv.o \
dlls/winmm/wineoss/wineoss.o \
dlls/winmm/winmm.o \
dlls/winspool/winspool.o \
dlls/wnaspi32/wnaspi32.o \
files/files.o \
......@@ -181,7 +193,6 @@ LIBOBJS = \
memory/memory.o \
misc/misc.o \
msdos/msdos.o \
multimedia/multimedia.o \
objects/objects.o \
ole/ole.o \
relay32/relay32.o \
......
configure
View file @ 68944c20
......@@ -5625,6 +5625,7 @@ dlls/commdlg/Makefile
dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/imagehlp/Makefile
dlls/imm32/Makefile
dlls/lzexpand/Makefile
......@@ -5651,9 +5652,14 @@ dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wing/Makefile
dlls/winmm/Makefile
dlls/winmm/mcianim/Makefile
dlls/winmm/mciavi/Makefile
dlls/winmm/mcicda/Makefile
dlls/winmm/mciseq/Makefile
dlls/winmm/mciwave/Makefile
dlls/winmm/wineoss/Makefile
dlls/wing/Makefile
dlls/winspool/Makefile
dlls/wnaspi32/Makefile
documentation/Makefile
......@@ -5678,7 +5684,6 @@ memory/Makefile
misc/Makefile
miscemu/Makefile
msdos/Makefile
multimedia/Makefile
objects/Makefile
ole/Makefile
programs/Makefile
......@@ -5821,6 +5826,7 @@ dlls/commdlg/Makefile
dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/imagehlp/Makefile
dlls/imm32/Makefile
dlls/lzexpand/Makefile
......@@ -5847,9 +5853,14 @@ dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wing/Makefile
dlls/winmm/Makefile
dlls/winmm/mcianim/Makefile
dlls/winmm/mciavi/Makefile
dlls/winmm/mcicda/Makefile
dlls/winmm/mciseq/Makefile
dlls/winmm/mciwave/Makefile
dlls/winmm/wineoss/Makefile
dlls/wing/Makefile
dlls/winspool/Makefile
dlls/wnaspi32/Makefile
documentation/Makefile
......@@ -5874,7 +5885,6 @@ memory/Makefile
misc/Makefile
miscemu/Makefile
msdos/Makefile
multimedia/Makefile
objects/Makefile
ole/Makefile
programs/Makefile
......
configure.in
View file @ 68944c20
......@@ -832,6 +832,7 @@ dlls/commdlg/Makefile
dlls/crtdll/Makefile
dlls/dciman32/Makefile
dlls/dplayx/Makefile
dlls/dsound/Makefile
dlls/imagehlp/Makefile
dlls/imm32/Makefile
dlls/lzexpand/Makefile
......@@ -858,9 +859,14 @@ dlls/win32s/Makefile
dlls/win87em/Makefile
dlls/winaspi/Makefile
dlls/windebug/Makefile
dlls/wing/Makefile
dlls/winmm/Makefile
dlls/winmm/mcianim/Makefile
dlls/winmm/mciavi/Makefile
dlls/winmm/mcicda/Makefile
dlls/winmm/mciseq/Makefile
dlls/winmm/mciwave/Makefile
dlls/winmm/wineoss/Makefile
dlls/wing/Makefile
dlls/winspool/Makefile
dlls/wnaspi32/Makefile
documentation/Makefile
......@@ -885,7 +891,6 @@ memory/Makefile
misc/Makefile
miscemu/Makefile
msdos/Makefile
multimedia/Makefile
objects/Makefile
ole/Makefile
programs/Makefile
......
dlls/dsound/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
dsound.spec.c
dlls/dsound/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dsound
SPEC_SRCS = \
dsound.spec
C_SRCS = \
dsound_main.c
all: $(MODULE).o
@MAKE_RULES@
### Dependencies:
dlls/winmm/.cvsignore
View file @ 68944c20
Makefile
lolvldrv.glue.c
mmsystem.glue.c
mmsystem.spec.c
winmm.spec.c
winmm_res.s
dlls/winmm/Makefile.in
View file @ 68944c20
......@@ -4,10 +4,30 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winmm
WRCEXTRA = -s -pwinmm
all: $(MODULE).o
SPEC_SRCS = \
mmsystem.spec \
winmm.spec
C_SRCS = \
joystick.c \
lolvldrv.c \
mci.c \
mmio.c \
mmsystem.c \
time.c
GLUE = lolvldrv.c \
mmsystem.c
RC_SRCS= \
winmm_res.rc
all: check_wrc $ $(MODULE).o
@MAKE_RULES@
### Dependencies:
$(RC_SRCS:.rc=.s): $(WRC)
### Dependencies:
dlls/winmm/mcianim/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
mcianim.spec.c
dlls/winmm/mcianim/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mcianim.drv
SPEC_SRCS = \
mcianim.spec
C_SRCS = \
mcianim.c
all: $(MODULE).o
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
### Dependencies:
dlls/winmm/mciavi/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
mciavi.spec.c
dlls/winmm/mciavi/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciavi.drv
SPEC_SRCS = \
mciavi.spec
C_SRCS = \
mciavi.c
all: $(MODULE).o
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
### Dependencies:
dlls/winmm/mcicda/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
mcicda.spec.c
dlls/winmm/mcicda/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mcicda.drv
SPEC_SRCS = \
mcicda.spec
C_SRCS = \
mcicda.c
all: $(MODULE).o
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
### Dependencies:
dlls/winmm/mciseq/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
mciseq.spec.c
dlls/winmm/mciseq/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciseq.drv
SPEC_SRCS = \
mciseq.spec
C_SRCS = \
mcimidi.c
all: $(MODULE).o
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
### Dependencies:
dlls/winmm/mciwave/.cvsignore 0 → 100644
View file @ 68944c20
Makefile
mciwave.spec.c
dlls/winmm/mciwave/Makefile.in 0 → 100644
View file @ 68944c20
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mciwave.drv
SPEC_SRCS = \
mciwave.spec
C_SRCS = \
mciwave.c \
all: $(MODULE).o
@MAKE_RULES@
call32.s: $(BUILD)
$(BUILD) @BUILDFLAGS@ -o $@ -call32
### Dependencies:
dlls/winmm/wineoss/Makefile.in
View file @ 68944c20
......@@ -8,7 +8,13 @@ MODULE = wineoss
SPEC_SRCS = \
wineoss.spec
C_SRCS =
C_SRCS = \
audio.c \
midi.c \
midipatch.c \
mixer.c \
mmaux.c \
oss.c
all: $(MODULE).o
......
if1632/.cvsignore
View file @ 68944c20
......@@ -7,7 +7,6 @@ display.spec.c
gdi.spec.c
kernel.spec.c
keyboard.spec.c
mmsystem.spec.c
mouse.spec.c
ole2conv.spec.c
ole2nls.spec.c
......
if1632/Makefile.in
View file @ 68944c20
......@@ -13,7 +13,6 @@ SPEC_SRCS = \
gdi.spec \
kernel.spec \
keyboard.spec \
mmsystem.spec \
mouse.spec \
ole2conv.spec \
ole2nls.spec \
......
multimedia/Makefile.in deleted 100644 → 0
View file @ 6ae75a1a
DEFS = @DLLFLAGS@ -D__WINE__
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = multimedia
WRCEXTRA = -s -pwinmm
C_SRCS = \
audio.c \
dsound.c \
joystick.c \
lolvldrv.c \
mci.c \
mcianim.c \
mciavi.c \
mcicda.c \
mcimidi.c \
mciwave.c \
midi.c \
midipatch.c \
mixer.c \
mmaux.c \
mmio.c \
mmsystem.c \
oss.c \
time.c
GLUE = lolvldrv.c \
mmsystem.c
RC_SRCS= \
winmm.rc
all: check_wrc $ $(MODULE).o
@MAKE_RULES@
$(RC_SRCS:.rc=.s): $(WRC)
### Dependencies:
relay32/.cvsignore
View file @ 68944c20
......@@ -2,15 +2,8 @@ Makefile
call32.s
ddraw.spec.c
dinput.spec.c
dsound.spec.c
gdi32.spec.c
kernel32.spec.c
mcianim.spec.c
mciavi.spec.c
mcicda.spec.c
mciseq.spec.c
mciwave.spec.c
user32.spec.c
winmm.spec.c
wow32.spec.c
wsock32.spec.c
relay32/Makefile.in
View file @ 68944c20
......@@ -8,16 +8,9 @@ MODULE = relay32
SPEC_SRCS = \
ddraw.spec \
dinput.spec \
dsound.spec \
gdi32.spec \
kernel32.spec \
mcianim.spec \
mciavi.spec \
mcicda.spec \
mciseq.spec \
mciwave.spec \
user32.spec \
winmm.spec \
wow32.spec \
wsock32.spec
......
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