Modified: branches/xmlbuildsystem/reactos/lib/uuid/uuid.c
Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml
Added: branches/xmlbuildsystem/reactos/subsys/smss/smss.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml
Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/format/format.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/services/services.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml
Added: branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.h
--- branches/xmlbuildsystem/reactos/lib/uuid/uuid.c 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/lib/uuid/uuid.c 2005-02-05 22:48:07 UTC (rev 13428)
@@ -85,3 +85,7 @@
DEFINE_GUID(CLSID_StdFont,0x0be35203,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51);
DEFINE_GUID(CLSID_StdPicture,0x0be35204,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51);
+
+DEFINE_GUID(IID_IWebBrowser2,0xd30c1661,0xcdaf,0x11d0,0x8a,0x3e,0x0,0xc0,0x4f,0xc9,0xe2,0x6e);
+DEFINE_GUID(DIID_DWebBrowserEvents2,0x34a715a0,0x6587,0x11d0,0x92,0x4a,0x0,0x20,0xaf,0xc7,0xac,0x4d);
+
--- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -4,6 +4,9 @@
<directory name="ntvdm">
<xi:include href="ntvdm/ntvdm.xml" />
</directory>
+<directory name="smss">
+ <xi:include href="smss/smss.xml" />
+</directory>
<directory name="system">
<xi:include href="system/directory.xml" />
</directory>
--- branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/smss/smss.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,9 @@
+<module name="smss" type="nativecui">
+ <include base="smss">.</include>
+ <define name="_DISABLE_TIDENTS" />
+ <library>ntdll</library>
+ <file>init.c</file>
+ <file>smapi.c</file>
+ <file>smss.c</file>
+ <file>smss.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/autochk/autochk.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,7 @@
+<module name="autochk" type="nativecui">
+ <include base="autochk">.</include>
+ <define name="_DISABLE_TIDENTS" />
+ <library>ntdll</library>
+ <file>autochk.c</file>
+ <file>autochk.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,13 @@
+<module name="calc" type="win32gui">
+ <include base="calc">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>comctl32</library>
+ <file>dialog.c</file>
+ <file>stats.c</file>
+ <file>winecalc.c</file>
+ <file>rsrc.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/cmd/cmd.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,62 @@
+<module name="cmd" type="win32cui">
+ <include base="ReactOS">include/wine</include>
+ <include base="cmd">.</include>
+ <define name="__USE_W32API" />
+ <define name="ANONYMOUSUNIONS" />
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>kernel32</library>
+ <file>alias.c</file>
+ <file>attrib.c</file>
+ <file>batch.c</file>
+ <file>beep.c</file>
+ <file>call.c</file>
+ <file>chcp.c</file>
+ <file>choice.c</file>
+ <file>cls.c</file>
+ <file>cmd.c</file>
+ <file>cmdinput.c</file>
+ <file>cmdtable.c</file>
+ <file>color.c</file>
+ <file>console.c</file>
+ <file>copy.c</file>
+ <file>date.c</file>
+ <file>del.c</file>
+ <file>delay.c</file>
+ <file>dir.c</file>
+ <file>dirstack.c</file>
+ <file>echo.c</file>
+ <file>error.c</file>
+ <file>filecomp.c</file>
+ <file>for.c</file>
+ <file>free.c</file>
+ <file>goto.c</file>
+ <file>history.c</file>
+ <file>if.c</file>
+ <file>internal.c</file>
+ <file>label.c</file>
+ <file>locale.c</file>
+ <file>memory.c</file>
+ <file>misc.c</file>
+ <file>move.c</file>
+ <file>msgbox.c</file>
+ <file>path.c</file>
+ <file>pause.c</file>
+ <file>prompt.c</file>
+ <file>redir.c</file>
+ <file>ren.c</file>
+ <file>screen.c</file>
+ <file>set.c</file>
+ <file>shift.c</file>
+ <file>start.c</file>
+ <file>strtoclr.c</file>
+ <file>time.c</file>
+ <file>timer.c</file>
+ <file>title.c</file>
+ <file>type.c</file>
+ <file>ver.c</file>
+ <file>verify.c</file>
+ <file>vol.c</file>
+ <file>where.c</file>
+ <file>window.c</file>
+ <file>cmd.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -1,3 +1,54 @@
+<directory name="autochk">
+ <xi:include href="autochk/autochk.xml" />
+</directory>
+<directory name="calc">
+ <xi:include href="calc/calc.xml" />
+</directory>
+<directory name="cmd">
+ <xi:include href="cmd/cmd.xml" />
+</directory>
+<directory name="explorer">
+ <xi:include href="explorer/explorer.xml" />
+</directory>
+<directory name="format">
+ <xi:include href="format/format.xml" />
+</directory>
+<directory name="notepad">
+ <xi:include href="notepad/notepad.xml" />
+</directory>
+<directory name="regedit">
+ <xi:include href="regedit/regedit.xml" />
+</directory>
+<directory name="regedt32">
+ <xi:include href="regedt32/regedt32.xml" />
+</directory>
+<directory name="regsvr32">
+ <xi:include href="regsvr32/regsvr32.xml" />
+</directory>
+<directory name="reporterror">
+ <xi:include href="reporterror/reporterror.xml" />
+</directory>
+<directory name="services">
+ <xi:include href="services/services.xml" />
+</directory>
+<directory name="setup">
+ <xi:include href="setup/setup.xml" />
+</directory>
+<directory name="taskmgr">
+ <xi:include href="taskmgr/taskmgr.xml" />
+</directory>
+<directory name="userinit">
+ <xi:include href="userinit/userinit.xml" />
+</directory>
+<directory name="vmwinst">
+ <xi:include href="vmwinst/vmwinst.xml" />
+</directory>
+<directory name="winefile">
+ <xi:include href="winefile/winefile.xml" />
+</directory>
+<directory name="winlogon">
+ <xi:include href="winlogon/winlogon.xml" />
+</directory>
<directory name="welcome">
<xi:include href="welcome/welcome.xml" />
</directory>
--- branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/explorer/explorer.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,66 @@
+<module name="explorer" type="win32gui">
+ <linkerflag>-fexceptions</linkerflag>
+ <include base="explorer">.</include>
+ <define name="__USE_W32API" />
+ <define name="UNICODE" />
+ <define name="WIN32" />
+ <define name="_ROS_" />
+ <define name="_WIN32_IE">0x0600</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <define name="WINVER">0x0500</define>
+ <library>uuid</library>
+ <library>kernel32</library>
+ <library>gdi32</library>
+ <library>ws2_32</library>
+ <library>msimg32</library>
+ <library>comctl32</library>
+ <library>ole32</library>
+ <library>oleaut32</library>
+ <library>shell32</library>
+ <library>expat</library>
+ <library>notifyhook</library>
+ <directory name="desktop">
+ <file>desktop.cpp</file>
+ </directory>
+ <directory name="dialogs">
+ <file>searchprogram.cpp</file>
+ <file>settings.cpp</file>
+ </directory>
+ <directory name="shell">
+ <file>entries.cpp</file>
+ <file>fatfs.cpp</file>
+ <file>filechild.cpp</file>
+ <file>shellfs.cpp</file>
+ <file>mainframe.cpp</file>
+ <file>ntobjfs.cpp</file>
+ <file>pane.cpp</file>
+ <file>regfs.cpp</file>
+ <file>shellbrowser.cpp</file>
+ <file>startup.c</file>
+ <file>unixfs.cpp</file>
+ <file>webchild.cpp</file>
+ <file>winfs.cpp</file>
+ </directory>
+ <directory name="taskbar">
+ <file>desktopbar.cpp</file>
+ <file>favorites.cpp</file>
+ <file>taskbar.cpp</file>
+ <file>startmenu.cpp</file>
+ <file>traynotify.cpp</file>
+ <file>quicklaunch.cpp</file>
+ </directory>
+ <directory name="utility">
+ <file>shellclasses.cpp</file>
+ <file>utility.cpp</file>
+ <file>window.cpp</file>
+ <file>dragdropimpl.cpp</file>
+ <file>shellbrowserimpl.cpp</file>
+ <file>xmlstorage.cpp</file>
+ </directory>
+ <file>explorer.cpp</file>
+ <file>i386-stub-win32.c</file>
+ <file>explorer.rc</file>
+</module>
+<directory name="notifyhook">
+ <xi:include href="notifyhook/notifyhook.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notifyhook.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notifyhook.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,10 @@
+<module name="notifyhook" type="win32dll">
+ <importlibrary definition="notifyhook.def" />
+ <include base="notifyhook">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0600</define>
+ <define name="_NOTIFYHOOK_IMPL" />
+ <library>kernel32</library>
+ <file>notifyhook.c</file>
+ <file>notifyhook.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/format/format.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,6 @@
+<module name="format" type="win32cui">
+ <include base="format">.</include>
+ <library>ntdll</library>
+ <library>fmifs</library>
+ <file>format.c</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/notepad/notepad.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,14 @@
+<module name="notepad" type="win32gui">
+ <include base="notepad">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>comdlg32</library>
+ <file>License_En.c</file>
+ <file>dialog.c</file>
+ <file>license.c</file>
+ <file>main.c</file>
+ <file>rsrc.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/regedit/regedit.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,28 @@
+<module name="regedit" type="win32gui">
+ <include base="regedit">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>uuid</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>advapi32</library>
+ <library>comdlg32</library>
+ <library>ole32</library>
+ <library>shell32</library>
+ <library>comctl32</library>
+ <library>comdlg32</library>
+ <file>about.c</file>
+ <file>childwnd.c</file>
+ <file>edit.c</file>
+ <file>framewnd.c</file>
+ <file>hexedit.c</file>
+ <file>listview.c</file>
+ <file>main.c</file>
+ <file>regedit.c</file>
+ <file>regproc.c</file>
+ <file>security.c</file>
+ <file>treeview.c</file>
+ <file>rsrc.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/regedt32/regedt32.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,22 @@
+<module name="regedt32" type="win32gui">
+ <include base="regedt32">.</include>
+ <define name="GCC" />
+ <define name="__USE_W32API" />
+ <define name="__REACTOS__" />
+ <define name="_WIN32_IE">0x600</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <define name="WINVER">0x0501</define>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>advapi32</library>
+ <library>comctl32</library>
+ <library>comdlg32</library>
+ <file>framewnd.c</file>
+ <file>childwnd.c</file>
+ <file>listview.c</file>
+ <file>treeview.c</file>
+ <file>settings.c</file>
+ <file>main.c</file>
+ <file>regedt32.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/regsvr32/regsvr32.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,10 @@
+<module name="regsvr32" type="win32gui">
+ <include base="regsvr32">.</include>
+ <define name="UNICODE" />
+ <define name="__USE_W32API" />
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>ole32</library>
+ <file>regsvr32.c</file>
+ <file>regsvr32.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,17 @@
+<module name="reporterror" type="win32gui">
+ <include base="reporterror">.</include>
+ <define name="__USE_W32API" />
+ <define name="UNICODE" />
+ <define name="_WIN32_IE">0x501</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>advapi32</library>
+ <library>ws2_32</library>
+ <library>comctl32</library>
+ <library>comdlg32</library>
+ <library>shell32</library>
+ <file>reporterror.c</file>
+ <file>reporterror.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/services/services.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/services/services.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,10 @@
+<module name="services" type="win32cui">
+ <include base="services">.</include>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>advapi32</library>
+ <file>services.c</file>
+ <file>database.c</file>
+ <file>services.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,8 @@
+<module name="setup" type="win32gui">
+ <include base="setup">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0400</define>
+ <library>kernel32</library>
+ <file>setup.c</file>
+ <file>setup.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/taskmgr/taskmgr.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,31 @@
+<module name="taskmgr" type="win32gui">
+ <include base="taskmgr">.</include>
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>comctl32</library>
+ <file>about.c</file>
+ <file>affinity.c</file>
+ <file>applpage.c</file>
+ <file>column.c</file>
+ <file>dbgchnl.c</file>
+ <file>debug.c</file>
+ <file>endproc.c</file>
+ <file>font.c</file>
+ <file>graph.c</file>
+ <file>optnmenu.c</file>
+ <file>perfdata.c</file>
+ <file>perfpage.c</file>
+ <file>priority.c</file>
+ <file>procpage.c</file>
+ <file>proclist.c</file>
+ <file>run.c</file>
+ <file>trayicon.c</file>
+ <file>taskmgr.c</file>
+ <file>graphctl.c</file>
+ <file>taskmgr.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/userinit/userinit.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,13 @@
+<module name="userinit" type="win32gui">
+ <include base="userinit">.</include>
+ <define name="UNICODE" />
+ <define name="_UNICODE" />
+ <define name="__USE_W32API" />
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>gdi32</library>
+ <library>advapi32</library>
+ <file>userinit.c</file>
+ <file>userinit.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/vmwinst/vmwinst.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,14 @@
+<module name="vmwinst" type="win32gui">
+ <include base="vmwinst">.</include>
+ <define name="UNICODE" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <library>kernel32</library>
+ <library>advapi32</library>
+ <library>comctl32</library>
+ <library>comdlg32</library>
+ <library>shell32</library>
+ <file>vmwinst.c</file>
+ <file>vmwinst.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,21 @@
+<module name="winefile" type="win32gui">
+ <include base="winefile">.</include>
+ <define name="UNICODE" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_IE">0x0501</define>
+ <define name="_WIN32_WINNT">0x0501</define>
+ <define name="_ROS_" />
+ <library>uuid</library>
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>gdi32</library>
+ <library>user32</library>
+ <library>comctl32</library>
+ <library>comdlg32</library>
+ <library>shell32</library>
+ <library>ole32</library>
+ <library>oleaut32</library>
+ <file>license.c</file>
+ <file>winefile.c</file>
+ <file>winefile.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/subsys/system/winlogon/winlogon.xml 2005-02-05 22:48:07 UTC (rev 13428)
@@ -0,0 +1,17 @@
+<module name="winlogon" type="win32cui">
+ <include base="winlogon">.</include>
+ <define name="UNICODE" />
+ <define name="_UNICODE" />
+ <define name="__USE_W32API" />
+ <library>ntdll</library>
+ <library>kernel32</library>
+ <library>user32</library>
+ <library>advapi32</library>
+ <library>userenv</library>
+ <library>secur32</library>
+ <file>sas.c</file>
+ <file>setup.c</file>
+ <file>winlogon.c</file>
+ <file>wlx.c</file>
+ <file>winlogon.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-02-05 22:48:07 UTC (rev 13428)
@@ -724,7 +724,9 @@
cflagsMacro );
return;
}
- else if ( extension == ".cc" || extension == ".CC" || extension == ".cxx" || extension == ".CXX" )
+ else if ( extension == ".cc" || extension == ".CC" ||
+ extension == ".cpp" || extension == ".CPP" ||
+ extension == ".cxx" || extension == ".CXX" )
{
GenerateGccCommand ( module,
sourceFilename,
@@ -1259,7 +1261,17 @@
return dependencies;
}
+bool
+MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const
+{
+ if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) )
+ return true;
+ if ( module.HasFileWithExtensions ( ".cpp", ".CPP" ) )
+ return true;
+ return false;
+}
+
static MingwBuildToolModuleHandler buildtool_handler;
MingwBuildToolModuleHandler::MingwBuildToolModuleHandler()
@@ -1285,7 +1297,7 @@
GenerateMacrosAndTargetsHost ( module );
string linker;
- if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) )
+ if ( IsCPlusPlusModule ( module ) )
linker = "${host_gpp}";
else
linker = "${host_gcc}";
@@ -1698,7 +1710,7 @@
linkingDependencies.c_str () );
string linker;
- if ( module.HasFileWithExtensions ( ".cc", ".CC" ) || module.HasFileWithExtensions ( ".cxx", ".CXX" ) )
+ if ( IsCPlusPlusModule ( module ) )
linker = "${gpp}";
else
linker = "${gcc}";
@@ -1807,10 +1819,16 @@
objectFilenames.c_str (),
importLibraryDependencies.c_str () );
+ string linker;
+ if ( IsCPlusPlusModule ( module ) )
+ linker = "${gpp}";
+ else
+ linker = "${gcc}";
+
string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
module.entrypoint.c_str () );
GenerateLinkerCommand ( module,
- "${gcc}",
+ linker,
linkerParameters,
objectFilenames );
}
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-02-05 21:04:17 UTC (rev 13427)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-02-05 22:48:07 UTC (rev 13428)
@@ -62,6 +62,7 @@
void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const;
std::string GetDefinitionDependencies ( const Module& module ) const;
std::string GetLinkingDependencies ( const Module& module ) const;
+ bool IsCPlusPlusModule ( const Module& module ) const;
static FILE* fMakefile;
static std::set<std::string> directory_set;
private: