* Build epsapi, dxguid, devenum, imm32, dinput8, dsound, expat, glu32, vfatlib
* Build dbghelp, gdiplus, dxdiagn, imagehlp, strmiids, dinput, fmifs, psapi
Added: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml
Added: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml
Added: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml
Added: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml
Modified: branches/xmlbuildsystem/reactos/lib/directory.xml
Added: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml
Added: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml
Added: branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml
Added: branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml
Added: branches/xmlbuildsystem/reactos/lib/expat/expat.xml
Added: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml
Added: branches/xmlbuildsystem/reactos/lib/fslib/directory.xml
Added: branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml
Added: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml
Added: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml
Added: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml
Added: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml
Added: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml
Added: branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml
Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Added: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml
--- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,37 @@
+<module name="dbghelp" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="dbghelp.spec.def" />
+	<include base="dbghelp">.</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>ntdll</library>
+	<library>kernel32</library>
+	<library>psapi</library>
+	<library>pseh</library>
+	<file>coff.c</file>
+	<file>dbghelp.c</file>
+	<file>elf_module.c</file>
+	<file>image.c</file>
+	<file>memory.c</file>
+	<file>minidump.c</file>
+	<file>module.c</file>
+	<file>msc.c</file>
+	<file>path.c</file>
+	<file>pe_module.c</file>
+	<file>regex.c</file>
+	<file>source.c</file>
+	<file>stabs.c</file>
+	<file>stack.c</file>
+	<file>storage.c</file>
+	<file>symbol.c</file>
+	<file>type.c</file>
+	<file>dbghelp.rc</file>
+	<file>dbghelp.spec</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml
--- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,28 @@
+<module name="devenum" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="devenum.spec.def" />
+	<include base="devenum">.</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>ole32</library>
+	<library>oleaut32</library>
+	<library>winmm</library>
+	<library>dxguid</library>
+	<library>strmiids</library>
+	<file>createdevenum.c</file>
+	<file>devenum_main.c</file>
+	<file>factory.c</file>
+	<file>mediacatenum.c</file>
+	<file>parsedisplayname.c</file>
+	<file>devenum.spec</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml
--- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,31 @@
+<module name="dinput" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="dinput.spec.def" />
+	<include base="dinput">.</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>user32</library>
+	<library>advapi32</library>
+	<library>ole32</library>
+	<library>winmm</library>
+	<library>dxguid</library>
+	<file>data_formats.c</file>
+	<file>device.c</file>
+	<file>dinput_main.c</file>
+	<file>joystick_linux.c</file>
+	<file>joystick_linuxinput.c</file>
+	<file>keyboard.c</file>
+	<file>mouse.c</file>
+	<file>regsvr.c</file>
+	<file>dinput.spec</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml
--- branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,25 @@
+<module name="dinput8" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="dinput8.spec.def" />
+	<include base="dinput8">.</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>user32</library>
+	<library>advapi32</library>
+	<library>ole32</library>
+	<library>winmm</library>
+	<library>dxguid</library>
+	<library>dinput</library>
+	<file>dinput8_main.c</file>
+	<file>dinput8.spec</file>
+</module>

Modified: branches/xmlbuildsystem/reactos/lib/directory.xml
--- branches/xmlbuildsystem/reactos/lib/directory.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/directory.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -31,15 +31,60 @@
 <directory name="crtdll">
 	<xi:include href="crtdll/crtdll.xml" />
 </directory>
+<directory name="dbghelp">
+	<xi:include href="dbghelp/dbghelp.xml" />
+</directory>
+<directory name="devenum">
+	<xi:include href="devenum/devenum.xml" />
+</directory>
+<directory name="dinput">
+	<xi:include href="dinput/dinput.xml" />
+</directory>
+<directory name="dinput8">
+	<xi:include href="dinput8/dinput8.xml" />
+</directory>
 <directory name="dnsapi">
 	<xi:include href="dnsapi/dnsapi.xml" />
 </directory>
+<directory name="dsound">
+	<xi:include href="dsound/dsound.xml" />
+</directory>
+<directory name="dxdiagn">
+	<xi:include href="dxdiagn/dxdiagn.xml" />
+</directory>
+<directory name="dxguid">
+	<xi:include href="dxguid/dxguid.xml" />
+</directory>
+<directory name="epsapi">
+	<xi:include href="epsapi/epsapi.xml" />
+</directory>
+<directory name="expat">
+	<xi:include href="expat/expat.xml" />
+</directory>
+<directory name="fmifs">
+	<xi:include href="fmifs/fmifs.xml" />
+</directory>
 <directory name="freetype">
 	<xi:include href="freetype/freetype.xml" />
 </directory>
+<directory name="fslib">
+	<xi:include href="fslib/directory.xml" />
+</directory>
 <directory name="gdi32">
 	<xi:include href="gdi32/gdi32.xml" />
 </directory>
+<directory name="gdiplus">
+	<xi:include href="gdiplus/gdiplus.xml" />
+</directory>
+<directory name="glu32">
+	<xi:include href="glu32/glu32.xml" />
+</directory>
+<directory name="imagehlp">
+	<xi:include href="imagehlp/imagehlp.xml" />
+</directory>
+<directory name="imm32">
+	<xi:include href="imm32/imm32.xml" />
+</directory>
 <directory name="iphlpapi">
 	<xi:include href="iphlpapi/iphlpapi.xml" />
 </directory>
@@ -65,6 +110,9 @@
 <directory name="oleaut32">
 	<xi:include href="oleaut32/oleaut32.xml" />
 </directory>
+<directory name="psapi">
+	<xi:include href="psapi/psapi.xml" />
+</directory>
 <directory name="pseh">
 	<xi:include href="pseh/pseh.xml" />
 </directory>
@@ -86,6 +134,9 @@
 <directory name="string">
 	<xi:include href="string/string.xml" />
 </directory>
+<directory name="strmiids">
+	<xi:include href="strmiids/strmiids.xml" />
+</directory>
 <directory name="unicode">
 	<xi:include href="unicode/unicode.xml" />
 </directory>

Added: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml
--- branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,8 @@
+<module name="dsound" type="win32dll">
+	<importlibrary definition="dsound.def" />
+	<include base="dsound">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<file>dsound.c</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml
--- branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,27 @@
+<module name="dxdiagn" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="dxdiagn.spec.def" />
+	<include base="dxdiagn">.</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>user32</library>
+	<library>advapi32</library>
+	<library>ole32</library>
+	<library>dxguid</library>
+	<library>strmiids</library>
+	<file>container.c</file>
+	<file>dxdiag_main.c</file>
+	<file>provider.c</file>
+	<file>regsvr.c</file>
+	<file>dxdiagn.spec</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml
--- branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/dxguid/dxguid.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,5 @@
+<module name="dxguid" type="staticlibrary">
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__REACTOS__" />
+	<file>dxguid-mingw.c</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml
--- branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/epsapi/epsapi.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,8 @@
+<module name="epsapi" type="objectlibrary">
+	<define name="_DISABLE_TIDENTS" />
+	<directory name="enum">
+		<file>drivers.c</file>
+		<file>modules.c</file>
+		<file>processes.c</file>
+	</directory>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/expat/expat.xml
--- branches/xmlbuildsystem/reactos/lib/expat/expat.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/expat/expat.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,12 @@
+<module name="expat" type="win32dll">
+	<importlibrary definition="lib/libexpat.def" />
+	<include base="expat">.</include>
+	<define name="HAVE_EXPAT_CONFIG_H" />
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<directory name="lib">
+		<file>xmlparse.c</file>
+		<file>xmlrole.c</file>
+		<file>xmltok.c</file>
+	</directory>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml
--- branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,18 @@
+<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12">
+	<importlibrary definition="fmifs.def" />
+	<include base="fmifs">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>vfatlib</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<file>chkdsk.c</file>
+	<file>compress.c</file>
+	<file>diskcopy.c</file>
+	<file>extend.c</file>
+	<file>format.c</file>
+	<file>init.c</file>
+	<file>label.c</file>
+	<file>media.c</file>
+	<file>fmifs.rc</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/fslib/directory.xml
--- branches/xmlbuildsystem/reactos/lib/fslib/directory.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/fslib/directory.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,3 @@
+<directory name="vfatlib">
+	<xi:include href="vfatlib/vfatlib.xml" />
+</directory>

Added: branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml
--- branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/vfatlib.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,8 @@
+<module name="vfatlib" type="staticlibrary">
+	<include base="vfatlib">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<file>fat12.c</file>
+	<file>fat16.c</file>
+	<file>fat32.c</file>
+	<file>vfatlib.c</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml
--- branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,45 @@
+<module name="gdiplus" type="win32dll">
+	<importlibrary definition="gdiplus.def" />
+	<include base="gdiplus">include</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>gdi32</library>
+	<library>msvcrt</library>
+	<directory name="gdiplus">
+		<file>arrow.c</file>
+		<file>bitmap.c</file>
+		<file>brush.c</file>
+		<file>clip.c</file>
+		<file>codec.c</file>
+		<file>container.c</file>
+		<file>dllmain.c</file>
+		<file>draw.c</file>
+		<file>effect.c</file>
+		<file>fill.c</file>
+		<file>font.c</file>
+		<file>graphics.c</file>
+		<file>image.c</file>
+		<file>linecap.c</file>
+		<file>linegradient.c</file>
+		<file>matrix.c</file>
+		<file>memory.c</file>
+		<file>metafile.c</file>
+		<file>palette.c</file>
+		<file>path.c</file>
+		<file>pathgradient.c</file>
+		<file>pathiterator.c</file>
+		<file>pen.c</file>
+		<file>region.c</file>
+		<file>string.c</file>
+		<file>texture.c</file>
+		<file>transform.c</file>
+	</directory>
+	<file>gdiplus.rc</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml
--- branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,119 @@
+<module name="glu32" type="win32dll">
+	<importlibrary definition="glu32.def" />
+	<include base="glu32">include</include>
+	<include base="glu32">libnurbs/internals</include>
+	<include base="glu32">libnurbs/interface</include>
+	<include base="glu32">libnurbs/nurbtess</include>
+	<include base="glu32">libtess</include>
+	<include base="glu32">libutil</include>
+	<define name="__USE_W32API" />
+	<define name="RESOLVE_3D_TEXTURE_SUPPORT" />
+	<define name="BUILD_GL32" />
+	<define name="LIBRARYBUILD" />
+	<linkerflag>-lopengl32</linkerflag>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>gdi32</library>
+	<library>msvcrt</library>
+	<directory name="libnurbs">
+		<directory name="interface">
+ 			<file>bezierEval.cc</file>
+			<file>bezierPatch.cc</file>
+			<file>bezierPatchMesh.cc</file>
+			<file>glcurveval.cc</file>
+			<file>glinterface.cc</file>
+			<file>glrenderer.cc</file>
+			<file>glsurfeval.cc</file>
+			<file>incurveeval.cc</file>
+			<file>insurfeval.cc</file>
+		</directory>
+		<directory name="internals">
+			<file>arc.cc</file>
+			<file>arcsorter.cc</file>
+			<file>arctess.cc</file>
+			<file>backend.cc</file>
+			<file>basiccrveval.cc</file>
+			<file>basicsurfeval.cc</file>
+			<file>bin.cc</file>
+			<file>bufpool.cc</file>
+			<file>cachingeval.cc</file>
+			<file>ccw.cc</file>
+			<file>coveandtiler.cc</file>
+			<file>curve.cc</file>
+			<file>curvelist.cc</file>
+			<file>curvesub.cc</file>
+			<file>dataTransform.cc</file>
+			<file>displaylist.cc</file>
+			<file>flist.cc</file>
+			<file>flistsorter.cc</file>
+			<file>hull.cc</file>
+			<file>intersect.cc</file>
+			<file>knotvector.cc</file>
+			<file>mapdesc.cc</file>
+			<file>mapdescv.cc</file>
+			<file>maplist.cc</file>
+			<file>mesher.cc</file>
+			<file>monoTriangulationBackend.cc</file>
+			<file>monotonizer.cc</file>
+			<file>mycode.cc</file>
+			<file>nurbsinterfac.cc</file>
+			<file>nurbstess.cc</file>
+			<file>patch.cc</file>
+			<file>patchlist.cc</file>
+			<file>quilt.cc</file>
+			<file>reader.cc</file>
+			<file>renderhints.cc</file>
+			<file>slicer.cc</file>
+			<file>sorter.cc</file>
+			<file>splitarcs.cc</file>
+			<file>subdivider.cc</file>
+			<file>tobezier.cc</file>
+			<file>trimline.cc</file>
+			<file>trimregion.cc</file>
+			<file>trimvertpool.cc</file>
+			<file>uarray.cc</file>
+			<file>varray.cc</file>
+		</directory>
+		<directory name="nurbtess">
+			<file>directedLine.cc</file>
+			<file>gridWrap.cc</file>
+			<file>monoChain.cc</file>
+			<file>monoPolyPart.cc</file>
+			<file>monoTriangulation.cc</file>
+			<file>partitionX.cc</file>
+			<file>partitionY.cc</file>
+			<file>polyDBG.cc</file>
+			<file>polyUtil.cc</file>
+			<file>primitiveStream.cc</file>
+			<file>quicksort.cc</file>
+			<file>rectBlock.cc</file>
+			<file>sampleComp.cc</file>
+			<file>sampleCompBot.cc</file>
+			<file>sampleCompRight.cc</file>
+			<file>sampleCompTop.cc</file>
+			<file>sampleMonoPoly.cc</file>
+			<file>sampledLine.cc</file>
+			<file>searchTree.cc</file>
+		</directory>
+	</directory>
+	<directory name="libtess">
+		<file>dict.c</file>
+		<file>geom.c</file>
+		<file>memalloc.c</file>
+		<file>mesh.c</file>
+		<file>normal.c</file>
+		<file>priorityq.c</file>
+		<file>render.c</file>
+		<file>sweep.c</file>
+		<file>tess.c</file>
+		<file>tessmono.c</file>
+	</directory>
+	<directory name="libutil">
+		<file>error.c</file>
+		<file>glue.c</file>
+		<file>mipmap.c</file>
+		<file>project.c</file>
+		<file>quad.c</file>
+		<file>registry.c</file>
+	</directory>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml
--- branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,26 @@
+<module name="imagehlp" type="win32dll">
+	<dependency>winebuild</dependency>
+	<importlibrary definition="imagehlp.def" />
+	<include base="imagehlp">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<define name="COBJMACROS" />
+	<define name="__need_offsetof" />
+	<define name="DCX_USESTYLE">0x10000L</define>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<file>access.c</file>
+	<file>debug.c</file>
+	<file>imagehlp_main.c</file>
+	<file>integrity.c</file>
+	<file>internal.c</file>
+	<file>modify.c</file>
+	<file>symbol.c</file>
+	<file>imagehlp.rc</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml
--- branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,12 @@
+<module name="imm32" type="win32dll">
+	<importlibrary definition="imm32.def" />
+	<include base="imm32">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<file>imm.c</file>
+	<file>imm32.rc</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml
--- branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,16 @@
+<module name="psapi" type="win32dll">
+	<importlibrary definition="psapi.def" />
+	<include base="psapi">.</include>
+	<include base="psapi">include</include>
+	<define name="_DISABLE_TIDENTS" />
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>epsapi</library>
+	<directory name="misc">
+		<file>dllmain.c</file>
+		<file>malloc.c</file>
+		<file>stubs.c</file>
+		<file>win32.c</file>
+	</directory>
+	<file>psapi.rc</file>
+</module>

Added: branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml
--- branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/strmiids/strmiids.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -0,0 +1,5 @@
+<module name="strmiids" type="staticlibrary">
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__REACTOS__" />
+	<file>strmiids.c</file>
+</module>

Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml
--- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml	2005-01-23 01:33:35 UTC (rev 13222)
@@ -1,5 +1,4 @@
 <module name="winmm" type="win32dll">
-	<dependency>bin2res</dependency>
 	<dependency>winebuild</dependency>
 	<importlibrary definition="winmm.spec.def" />
 	<include base="winmm">.</include>

Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp	2005-01-22 22:00:17 UTC (rev 13221)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp	2005-01-23 01:33:35 UTC (rev 13222)
@@ -724,7 +724,7 @@
 		                     cflagsMacro );
 		return;
 	}
-	else if ( extension == ".cxx" || extension == ".CXX" )
+	else if ( extension == ".cc" || extension == ".CC" || extension == ".cxx" || extension == ".CXX" )
 	{
 		GenerateGccCommand ( module,
 		                     sourceFilename,
@@ -1651,10 +1651,16 @@
 		          objectFilenames.c_str (),
 		          linkingDependencies.c_str () );
 
+		string linker;
+		if ( module.HasFileWithExtensions ( ".cc", ".CC" ) || module.HasFileWithExtensions ( ".cxx", ".CXX" ) )
+			linker = "${gpp}";
+		else
+			linker = "${gcc}";
+
 		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll",
 		                                    module.entrypoint.c_str () );
 		GenerateLinkerCommand ( module,
-		                        "${gcc}",
+		                        linker,
 		                        linkerParameters,
 		                        objectFilenames );
 	}