[ros-diffs] [ion] 15727: Fix midimap/wavemap build

Fix midimap/wavemap build
Modified: trunk/reactos/baseaddress.xml
Modified: trunk/reactos/lib/directory.xml
Deleted: trunk/reactos/lib/midimap/
Deleted: trunk/reactos/lib/winmm/Makefile.in
Deleted: trunk/reactos/lib/winmm/Makefile.ros-template
Added: trunk/reactos/lib/winmm/directory.xml
Deleted: trunk/reactos/lib/winmm/midimap/Makefile.in
Deleted: trunk/reactos/lib/winmm/midimap/Makefile.ros-template
Deleted: trunk/reactos/lib/winmm/midimap/makefile
Added: trunk/reactos/lib/winmm/midimap/midimap.xml
Deleted: trunk/reactos/lib/winmm/wavemap/Makefile.in
Deleted: trunk/reactos/lib/winmm/wavemap/Makefile.ros-template
Deleted: trunk/reactos/lib/winmm/wavemap/makefile
Added: trunk/reactos/lib/winmm/wavemap/wavemap.xml
  _____  

Modified: trunk/reactos/baseaddress.xml
--- trunk/reactos/baseaddress.xml	2005-06-02 02:12:48 UTC (rev
15726)
+++ trunk/reactos/baseaddress.xml	2005-06-02 03:21:17 UTC (rev
15727)
@@ -49,6 +49,7 @@

 <property name="BASEADDRESS_RICHED20" value="0x76360000" />
 <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />
 <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
+<property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
 <property name="BASEADDRESS_MPR" value="0x76620000" />
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
 <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
  _____  

Modified: trunk/reactos/lib/directory.xml
--- trunk/reactos/lib/directory.xml	2005-06-02 02:12:48 UTC (rev
15726)
+++ trunk/reactos/lib/directory.xml	2005-06-02 03:21:17 UTC (rev
15727)
@@ -136,9 +136,6 @@

 <directory name="mesa32">
 	<xi:include href="mesa32/mesa32.xml" />
 </directory>
-<directory name="midimap">
-	<xi:include href="midimap/midimap.xml" />
-</directory>
 <directory name="mmdrv">
 	<xi:include href="mmdrv/mmdrv.xml" />
 </directory>
@@ -275,7 +272,7 @@
 	<xi:include href="wininet/wininet.xml" />
 </directory>
 <directory name="winmm">
-	<xi:include href="winmm/winmm.xml" />
+	<xi:include href="winmm/directory.xml" />
 </directory>
 <directory name="winspool">
 	<xi:include href="winspool/winspool.xml" />
  _____  

Deleted: trunk/reactos/lib/winmm/Makefile.in
--- trunk/reactos/lib/winmm/Makefile.in	2005-06-02 02:12:48 UTC (rev
15726)
+++ trunk/reactos/lib/winmm/Makefile.in	2005-06-02 03:21:17 UTC (rev
15727)
@@ -1,36 +0,0 @@

-EXTRADEFS = -D_WINMM_
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = winmm.dll
-IMPORTLIB = libwinmm.$(IMPLIBEXT)
-IMPORTS   = user32 advapi32 kernel32 ntdll
-EXTRALIBS = $(LIBUNICODE)
-
-C_SRCS = \
-	driver.c \
-	joystick.c \
-	lolvldrv.c \
-	mci.c \
-	mmio.c \
-	playsound.c \
-	time.c \
-	winmm.c
-
-C_SRCS16 = \
-	message16.c \
-	mmsystem.c \
-	sound16.c
-
-SPEC_SRCS16 = \
-	mmsystem.spec \
-	sound.spec
-
-RC_SRCS = winmm_res.rc
-
-SUBDIRS = tests
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Deleted: trunk/reactos/lib/winmm/Makefile.ros-template
--- trunk/reactos/lib/winmm/Makefile.ros-template	2005-06-02
02:12:48 UTC (rev 15726)
+++ trunk/reactos/lib/winmm/Makefile.ros-template	2005-06-02
03:21:17 UTC (rev 15727)
@@ -1,21 +0,0 @@

-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = winmm
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = $(TARGET_BASE_LIB_WINMM)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
  _____  

Added: trunk/reactos/lib/winmm/directory.xml
--- trunk/reactos/lib/winmm/directory.xml	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/directory.xml	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -0,0 +1,7 @@

+<xi:include href="winmm.xml" />
+<directory name="midimap">
+	<xi:include href="midimap/midimap.xml" />
+</directory>
+<directory name="wavemap">
+	<xi:include href="wavemap/wavemap.xml" />
+</directory> 
  _____  

Deleted: trunk/reactos/lib/winmm/midimap/Makefile.in
--- trunk/reactos/lib/winmm/midimap/Makefile.in	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/midimap/Makefile.in	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -1,13 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = midimap.drv
-IMPORTS   = winmm user32 advapi32 kernel32
-
-C_SRCS = \
-	midimap.c
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Deleted: trunk/reactos/lib/winmm/midimap/Makefile.ros-template
--- trunk/reactos/lib/winmm/midimap/Makefile.ros-template
2005-06-02 02:12:48 UTC (rev 15726)
+++ trunk/reactos/lib/winmm/midimap/Makefile.ros-template
2005-06-02 03:21:17 UTC (rev 15727)
@@ -1,23 +0,0 @@

-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = midimap
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = $(TARGET_LIB_BASE_MIDIMAP)
-
-TARGET_RC_SRCS = @RC_SRCS@
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-TARGET_EXTENSION = .dll
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
  _____  

Deleted: trunk/reactos/lib/winmm/midimap/makefile
--- trunk/reactos/lib/winmm/midimap/makefile	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/midimap/makefile	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -1,9 +0,0 @@

-# $Id: makefile 8620 2004-03-10 15:22:45Z silverblade $
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = winedll
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
  _____  

Added: trunk/reactos/lib/winmm/midimap/midimap.xml
--- trunk/reactos/lib/winmm/midimap/midimap.xml	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/midimap/midimap.xml	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -0,0 +1,22 @@

+<module name="midimap" type="win32dll"
baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32"
installname="midimap.dll" warnings="true">
+	<importlibrary definition="midimap.spec.def" />
+	<include base="midimap">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<library>winmm</library>
+	<file>midimap.c</file>
+	<file>midimap.rc</file>
+	<file>midimap.spec</file>
+</module>
  _____  

Deleted: trunk/reactos/lib/winmm/wavemap/Makefile.in
--- trunk/reactos/lib/winmm/wavemap/Makefile.in	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/wavemap/Makefile.in	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -1,13 +0,0 @@

-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = msacm.drv
-IMPORTS   = msacm32 winmm user32 kernel32
-
-C_SRCS = \
-	wavemap.c
-
-@MAKE_DLL_RULES@
-
-### Dependencies:
  _____  

Deleted: trunk/reactos/lib/winmm/wavemap/Makefile.ros-template
--- trunk/reactos/lib/winmm/wavemap/Makefile.ros-template
2005-06-02 02:12:48 UTC (rev 15726)
+++ trunk/reactos/lib/winmm/wavemap/Makefile.ros-template
2005-06-02 03:21:17 UTC (rev 15727)
@@ -1,23 +0,0 @@

-# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $
-
-TARGET_NAME = msacm
-
-TARGET_OBJECTS = @C_SRCS@
-
-TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__
-
-TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a
-
-TARGET_BASE = 0x76160000
-
-TARGET_RC_SRCS = wavemap.rc
-TARGET_RC_BINSRC = @RC_BINSRC@
-TARGET_RC_BINARIES = @RC_BINARIES@
-
-TARGET_EXTENSION = .drv
-
-default: all
-
-DEP_OBJECTS = $(TARGET_OBJECTS)
-
-include $(TOOLS_PATH)/depend.mk
  _____  

Deleted: trunk/reactos/lib/winmm/wavemap/makefile
--- trunk/reactos/lib/winmm/wavemap/makefile	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/wavemap/makefile	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -1,9 +0,0 @@

-# $Id: makefile 8620 2004-03-10 15:22:45Z silverblade $
-
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = winedll
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
  _____  

Added: trunk/reactos/lib/winmm/wavemap/wavemap.xml
--- trunk/reactos/lib/winmm/wavemap/wavemap.xml	2005-06-02 02:12:48 UTC
(rev 15726)
+++ trunk/reactos/lib/winmm/wavemap/wavemap.xml	2005-06-02 03:21:17 UTC
(rev 15727)
@@ -0,0 +1,23 @@

+<module name="wavemap" type="win32dll"
baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32"
installname="wavemap.dll" warnings="true">
+	<importlibrary definition="msacm.spec.def" />
+	<include base="wavemap">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+    <library>msacm32</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<library>user32</library>
+	<library>winmm</library>
+	<file>wavemap.c</file>
+	<file>wavemap.rc</file>
+	<file>msacm.spec</file>
+</module>