Build smss and system applications

svn path=/branches/xmlbuildsystem/; revision=13428

diff --git a/reactos/lib/uuid/uuid.c b/reactos/lib/uuid/uuid.c
index b569949..854e3ae 100644 (file)
--- a/reactos/lib/uuid/uuid.c
+++ b/reactos/lib/uuid/uuid.c
@@ -85,3 +85,7 @@ DEFINE_OLEGUID(IID_StdOle,0x00020430,0,0);
 
 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);
+

diff --git a/reactos/subsys/directory.xml b/reactos/subsys/directory.xml
index 2f292c6..26df8db 100644 (file)
--- a/reactos/subsys/directory.xml
+++ b/reactos/subsys/directory.xml
@@ -4,6 +4,9 @@
 <directory name="ntvdm">\r
        <xi:include href="ntvdm/ntvdm.xml" />\r
 </directory>\r
+<directory name="smss">\r
+       <xi:include href="smss/smss.xml" />\r
+</directory>\r
 <directory name="system">\r
        <xi:include href="system/directory.xml" />\r
 </directory>\r

diff --git a/reactos/subsys/smss/smss.xml b/reactos/subsys/smss/smss.xml
new file mode 100644 (file)
index 0000000..ebb5019
--- /dev/null
+++ b/reactos/subsys/smss/smss.xml
@@ -0,0 +1,9 @@
+<module name="smss" type="nativecui">\r
+       <include base="smss">.</include>\r
+       <define name="_DISABLE_TIDENTS" />\r
+       <library>ntdll</library>\r
+       <file>init.c</file>\r
+       <file>smapi.c</file>\r
+       <file>smss.c</file>\r
+       <file>smss.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/autochk/autochk.xml b/reactos/subsys/system/autochk/autochk.xml
new file mode 100644 (file)
index 0000000..99f0570
--- /dev/null
+++ b/reactos/subsys/system/autochk/autochk.xml
@@ -0,0 +1,7 @@
+<module name="autochk" type="nativecui">\r
+       <include base="autochk">.</include>\r
+       <define name="_DISABLE_TIDENTS" />\r
+       <library>ntdll</library>\r
+       <file>autochk.c</file>\r
+       <file>autochk.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/calc/calc.xml b/reactos/subsys/system/calc/calc.xml
new file mode 100644 (file)
index 0000000..55c6413
--- /dev/null
+++ b/reactos/subsys/system/calc/calc.xml
@@ -0,0 +1,13 @@
+<module name="calc" type="win32gui">\r
+       <include base="calc">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>comctl32</library>\r
+       <file>dialog.c</file>\r
+       <file>stats.c</file>\r
+       <file>winecalc.c</file>\r
+       <file>rsrc.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/cmd/cmd.xml b/reactos/subsys/system/cmd/cmd.xml
new file mode 100644 (file)
index 0000000..a43ff1b
--- /dev/null
+++ b/reactos/subsys/system/cmd/cmd.xml
@@ -0,0 +1,62 @@
+<module name="cmd" type="win32cui">\r
+       <include base="ReactOS">include/wine</include>\r
+       <include base="cmd">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="ANONYMOUSUNIONS" />\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <library>kernel32</library>\r
+       <file>alias.c</file>\r
+       <file>attrib.c</file>\r
+       <file>batch.c</file>\r
+       <file>beep.c</file>\r
+       <file>call.c</file>\r
+       <file>chcp.c</file>\r
+       <file>choice.c</file>\r
+       <file>cls.c</file>\r
+       <file>cmd.c</file>\r
+       <file>cmdinput.c</file>\r
+       <file>cmdtable.c</file>\r
+       <file>color.c</file>\r
+       <file>console.c</file>\r
+       <file>copy.c</file>\r
+       <file>date.c</file>\r
+       <file>del.c</file>\r
+       <file>delay.c</file>\r
+       <file>dir.c</file>\r
+       <file>dirstack.c</file>\r
+       <file>echo.c</file>\r
+       <file>error.c</file>\r
+       <file>filecomp.c</file>\r
+       <file>for.c</file>\r
+       <file>free.c</file>\r
+       <file>goto.c</file>\r
+       <file>history.c</file>\r
+       <file>if.c</file>\r
+       <file>internal.c</file>\r
+       <file>label.c</file>\r
+       <file>locale.c</file>\r
+       <file>memory.c</file>\r
+       <file>misc.c</file>\r
+       <file>move.c</file>\r
+       <file>msgbox.c</file>\r
+       <file>path.c</file>\r
+       <file>pause.c</file>\r
+       <file>prompt.c</file>\r
+       <file>redir.c</file>\r
+       <file>ren.c</file>\r
+       <file>screen.c</file>\r
+       <file>set.c</file>\r
+       <file>shift.c</file>\r
+       <file>start.c</file>\r
+       <file>strtoclr.c</file>\r
+       <file>time.c</file>\r
+       <file>timer.c</file>\r
+       <file>title.c</file>\r
+       <file>type.c</file>\r
+       <file>ver.c</file>\r
+       <file>verify.c</file>\r
+       <file>vol.c</file>\r
+       <file>where.c</file>\r
+       <file>window.c</file>\r
+       <file>cmd.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml
index fdee0ae..516e20c 100644 (file)
--- a/reactos/subsys/system/directory.xml
+++ b/reactos/subsys/system/directory.xml
@@ -1,3 +1,54 @@
+<directory name="autochk">\r
+       <xi:include href="autochk/autochk.xml" />\r
+</directory>\r
+<directory name="calc">\r
+       <xi:include href="calc/calc.xml" />\r
+</directory>\r
+<directory name="cmd">\r
+       <xi:include href="cmd/cmd.xml" />\r
+</directory>\r
+<directory name="explorer">\r
+       <xi:include href="explorer/explorer.xml" />\r
+</directory>\r
+<directory name="format">\r
+       <xi:include href="format/format.xml" />\r
+</directory>\r
+<directory name="notepad">\r
+       <xi:include href="notepad/notepad.xml" />\r
+</directory>\r
+<directory name="regedit">\r
+       <xi:include href="regedit/regedit.xml" />\r
+</directory>\r
+<directory name="regedt32">\r
+       <xi:include href="regedt32/regedt32.xml" />\r
+</directory>\r
+<directory name="regsvr32">\r
+       <xi:include href="regsvr32/regsvr32.xml" />\r
+</directory>\r
+<directory name="reporterror">\r
+       <xi:include href="reporterror/reporterror.xml" />\r
+</directory>\r
+<directory name="services">\r
+       <xi:include href="services/services.xml" />\r
+</directory>\r
+<directory name="setup">\r
+       <xi:include href="setup/setup.xml" />\r
+</directory>\r
+<directory name="taskmgr">\r
+       <xi:include href="taskmgr/taskmgr.xml" />\r
+</directory>\r
+<directory name="userinit">\r
+       <xi:include href="userinit/userinit.xml" />\r
+</directory>\r
+<directory name="vmwinst">\r
+       <xi:include href="vmwinst/vmwinst.xml" />\r
+</directory>\r
+<directory name="winefile">\r
+       <xi:include href="winefile/winefile.xml" />\r
+</directory>\r
+<directory name="winlogon">\r
+       <xi:include href="winlogon/winlogon.xml" />\r
+</directory>\r
 <directory name="welcome">\r
        <xi:include href="welcome/welcome.xml" />\r
 </directory>\r

diff --git a/reactos/subsys/system/explorer/explorer.xml b/reactos/subsys/system/explorer/explorer.xml
new file mode 100644 (file)
index 0000000..468625f
--- /dev/null
+++ b/reactos/subsys/system/explorer/explorer.xml
@@ -0,0 +1,66 @@
+<module name="explorer" type="win32gui">\r
+       <linkerflag>-fexceptions</linkerflag>\r
+       <include base="explorer">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="UNICODE" />\r
+       <define name="WIN32" />\r
+       <define name="_ROS_" />\r
+       <define name="_WIN32_IE">0x0600</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <define name="WINVER">0x0500</define>\r
+       <library>uuid</library>\r
+       <library>kernel32</library>\r
+       <library>gdi32</library>\r
+       <library>ws2_32</library>\r
+       <library>msimg32</library>\r
+       <library>comctl32</library>\r
+       <library>ole32</library>\r
+       <library>oleaut32</library>\r
+       <library>shell32</library>\r
+       <library>expat</library>\r
+       <library>notifyhook</library>\r
+       <directory name="desktop">\r
+               <file>desktop.cpp</file>\r
+       </directory>\r
+       <directory name="dialogs">\r
+               <file>searchprogram.cpp</file>\r
+               <file>settings.cpp</file>\r
+       </directory>\r
+       <directory name="shell">\r
+               <file>entries.cpp</file>\r
+               <file>fatfs.cpp</file>\r
+               <file>filechild.cpp</file>\r
+               <file>shellfs.cpp</file>\r
+               <file>mainframe.cpp</file>\r
+               <file>ntobjfs.cpp</file>\r
+               <file>pane.cpp</file>\r
+               <file>regfs.cpp</file>\r
+               <file>shellbrowser.cpp</file>\r
+               <file>startup.c</file>\r
+               <file>unixfs.cpp</file>\r
+               <file>webchild.cpp</file>\r
+               <file>winfs.cpp</file>\r
+       </directory>\r
+       <directory name="taskbar">\r
+               <file>desktopbar.cpp</file>\r
+               <file>favorites.cpp</file>\r
+               <file>taskbar.cpp</file>\r
+               <file>startmenu.cpp</file>\r
+               <file>traynotify.cpp</file>\r
+               <file>quicklaunch.cpp</file>\r
+       </directory>\r
+       <directory name="utility">\r
+               <file>shellclasses.cpp</file>\r
+               <file>utility.cpp</file>\r
+               <file>window.cpp</file>\r
+               <file>dragdropimpl.cpp</file>\r
+               <file>shellbrowserimpl.cpp</file>\r
+               <file>xmlstorage.cpp</file>\r
+       </directory>\r
+       <file>explorer.cpp</file>\r
+       <file>i386-stub-win32.c</file>\r
+       <file>explorer.rc</file>\r
+</module>\r
+<directory name="notifyhook">\r
+       <xi:include href="notifyhook/notifyhook.xml" />\r
+</directory>\r

diff --git a/reactos/subsys/system/explorer/notifyhook/notifyhook.xml b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
new file mode 100644 (file)
index 0000000..cbcedcf
--- /dev/null
+++ b/reactos/subsys/system/explorer/notifyhook/notifyhook.xml
@@ -0,0 +1,10 @@
+<module name="notifyhook" type="win32dll">\r
+       <importlibrary definition="notifyhook.def" />\r
+       <include base="notifyhook">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0600</define>\r
+       <define name="_NOTIFYHOOK_IMPL" />\r
+       <library>kernel32</library>\r
+       <file>notifyhook.c</file>\r
+       <file>notifyhook.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/format/format.xml b/reactos/subsys/system/format/format.xml
new file mode 100644 (file)
index 0000000..d406c85
--- /dev/null
+++ b/reactos/subsys/system/format/format.xml
@@ -0,0 +1,6 @@
+<module name="format" type="win32cui">\r
+       <include base="format">.</include>\r
+       <library>ntdll</library>\r
+       <library>fmifs</library>\r
+       <file>format.c</file>\r
+</module>\r

diff --git a/reactos/subsys/system/notepad/notepad.xml b/reactos/subsys/system/notepad/notepad.xml
new file mode 100644 (file)
index 0000000..ca8c266
--- /dev/null
+++ b/reactos/subsys/system/notepad/notepad.xml
@@ -0,0 +1,14 @@
+<module name="notepad" type="win32gui">\r
+       <include base="notepad">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>comdlg32</library>\r
+       <file>License_En.c</file>\r
+       <file>dialog.c</file>\r
+       <file>license.c</file>\r
+       <file>main.c</file>\r
+       <file>rsrc.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/regedit/regedit.xml b/reactos/subsys/system/regedit/regedit.xml
new file mode 100644 (file)
index 0000000..9e2545a
--- /dev/null
+++ b/reactos/subsys/system/regedit/regedit.xml
@@ -0,0 +1,28 @@
+<module name="regedit" type="win32gui">\r
+       <include base="regedit">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <library>uuid</library>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>advapi32</library>\r
+       <library>comdlg32</library>\r
+       <library>ole32</library>\r
+       <library>shell32</library>\r
+       <library>comctl32</library>\r
+       <library>comdlg32</library>\r
+       <file>about.c</file>\r
+       <file>childwnd.c</file>\r
+       <file>edit.c</file>\r
+       <file>framewnd.c</file>\r
+       <file>hexedit.c</file>\r
+       <file>listview.c</file>\r
+       <file>main.c</file>\r
+       <file>regedit.c</file>\r
+       <file>regproc.c</file>\r
+       <file>security.c</file>\r
+       <file>treeview.c</file>\r
+       <file>rsrc.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/regedt32/regedt32.xml b/reactos/subsys/system/regedt32/regedt32.xml
new file mode 100644 (file)
index 0000000..3acc989
--- /dev/null
+++ b/reactos/subsys/system/regedt32/regedt32.xml
@@ -0,0 +1,22 @@
+<module name="regedt32" type="win32gui">\r
+       <include base="regedt32">.</include>\r
+       <define name="GCC" />\r
+       <define name="__USE_W32API" />\r
+       <define name="__REACTOS__" />\r
+       <define name="_WIN32_IE">0x600</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <define name="WINVER">0x0501</define>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>advapi32</library>\r
+       <library>comctl32</library>\r
+       <library>comdlg32</library>\r
+       <file>framewnd.c</file>\r
+       <file>childwnd.c</file>\r
+       <file>listview.c</file>\r
+       <file>treeview.c</file>\r
+       <file>settings.c</file>\r
+       <file>main.c</file>\r
+       <file>regedt32.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/regsvr32/regsvr32.xml b/reactos/subsys/system/regsvr32/regsvr32.xml
new file mode 100644 (file)
index 0000000..b0e1f4f
--- /dev/null
+++ b/reactos/subsys/system/regsvr32/regsvr32.xml
@@ -0,0 +1,10 @@
+<module name="regsvr32" type="win32gui">\r
+       <include base="regsvr32">.</include>\r
+       <define name="UNICODE" />\r
+       <define name="__USE_W32API" />\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>ole32</library>\r
+       <file>regsvr32.c</file>\r
+       <file>regsvr32.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/reporterror/reporterror.xml b/reactos/subsys/system/reporterror/reporterror.xml
new file mode 100644 (file)
index 0000000..b6a367f
--- /dev/null
+++ b/reactos/subsys/system/reporterror/reporterror.xml
@@ -0,0 +1,17 @@
+<module name="reporterror" type="win32gui">\r
+       <include base="reporterror">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="UNICODE" />\r
+       <define name="_WIN32_IE">0x501</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>advapi32</library>\r
+       <library>ws2_32</library>\r
+       <library>comctl32</library>\r
+       <library>comdlg32</library>\r
+       <library>shell32</library>\r
+       <file>reporterror.c</file>\r
+       <file>reporterror.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/services/services.xml b/reactos/subsys/system/services/services.xml
new file mode 100644 (file)
index 0000000..f98776b
--- /dev/null
+++ b/reactos/subsys/system/services/services.xml
@@ -0,0 +1,10 @@
+<module name="services" type="win32cui">\r
+       <include base="services">.</include>\r
+       <library>ntdll</library>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>advapi32</library>\r
+       <file>services.c</file>\r
+       <file>database.c</file>\r
+       <file>services.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/setup/setup.xml b/reactos/subsys/system/setup/setup.xml
new file mode 100644 (file)
index 0000000..6d854af
--- /dev/null
+++ b/reactos/subsys/system/setup/setup.xml
@@ -0,0 +1,8 @@
+<module name="setup" type="win32gui">\r
+       <include base="setup">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0400</define>\r
+       <library>kernel32</library>\r
+       <file>setup.c</file>\r
+       <file>setup.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/taskmgr/taskmgr.xml b/reactos/subsys/system/taskmgr/taskmgr.xml
new file mode 100644 (file)
index 0000000..040a3d1
--- /dev/null
+++ b/reactos/subsys/system/taskmgr/taskmgr.xml
@@ -0,0 +1,31 @@
+<module name="taskmgr" type="win32gui">\r
+       <include base="taskmgr">.</include>\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <library>ntdll</library>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>comctl32</library>\r
+       <file>about.c</file>\r
+       <file>affinity.c</file>\r
+       <file>applpage.c</file>\r
+       <file>column.c</file>\r
+       <file>dbgchnl.c</file>\r
+       <file>debug.c</file>\r
+       <file>endproc.c</file>\r
+       <file>font.c</file>\r
+       <file>graph.c</file>\r
+       <file>optnmenu.c</file>\r
+       <file>perfdata.c</file>\r
+       <file>perfpage.c</file>\r
+       <file>priority.c</file>\r
+       <file>procpage.c</file>\r
+       <file>proclist.c</file>\r
+       <file>run.c</file>\r
+       <file>trayicon.c</file>\r
+       <file>taskmgr.c</file>\r
+       <file>graphctl.c</file>\r
+       <file>taskmgr.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/userinit/userinit.xml b/reactos/subsys/system/userinit/userinit.xml
new file mode 100644 (file)
index 0000000..4e76a9c
--- /dev/null
+++ b/reactos/subsys/system/userinit/userinit.xml
@@ -0,0 +1,13 @@
+<module name="userinit" type="win32gui">\r
+       <include base="userinit">.</include>\r
+       <define name="UNICODE" />\r
+       <define name="_UNICODE" />\r
+       <define name="__USE_W32API" />\r
+       <library>ntdll</library>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>gdi32</library>\r
+       <library>advapi32</library>\r
+       <file>userinit.c</file>\r
+       <file>userinit.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/vmwinst/vmwinst.xml b/reactos/subsys/system/vmwinst/vmwinst.xml
new file mode 100644 (file)
index 0000000..681e4d0
--- /dev/null
+++ b/reactos/subsys/system/vmwinst/vmwinst.xml
@@ -0,0 +1,14 @@
+<module name="vmwinst" type="win32gui">\r
+       <include base="vmwinst">.</include>\r
+       <define name="UNICODE" />\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <library>kernel32</library>\r
+       <library>advapi32</library>\r
+       <library>comctl32</library>\r
+       <library>comdlg32</library>\r
+       <library>shell32</library>\r
+       <file>vmwinst.c</file>\r
+       <file>vmwinst.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/winefile/winefile.xml b/reactos/subsys/system/winefile/winefile.xml
new file mode 100644 (file)
index 0000000..1d7d9c7
--- /dev/null
+++ b/reactos/subsys/system/winefile/winefile.xml
@@ -0,0 +1,21 @@
+<module name="winefile" type="win32gui">\r
+       <include base="winefile">.</include>\r
+       <define name="UNICODE" />\r
+       <define name="__USE_W32API" />\r
+       <define name="_WIN32_IE">0x0501</define>\r
+       <define name="_WIN32_WINNT">0x0501</define>\r
+       <define name="_ROS_" />\r
+       <library>uuid</library>\r
+       <library>ntdll</library>\r
+       <library>kernel32</library>\r
+       <library>gdi32</library>\r
+       <library>user32</library>\r
+       <library>comctl32</library>\r
+       <library>comdlg32</library>\r
+       <library>shell32</library>\r
+       <library>ole32</library>\r
+       <library>oleaut32</library>\r
+       <file>license.c</file>\r
+       <file>winefile.c</file>\r
+       <file>winefile.rc</file>\r
+</module>\r

diff --git a/reactos/subsys/system/winlogon/winlogon.xml b/reactos/subsys/system/winlogon/winlogon.xml
new file mode 100644 (file)
index 0000000..6ff9b21
--- /dev/null
+++ b/reactos/subsys/system/winlogon/winlogon.xml
@@ -0,0 +1,17 @@
+<module name="winlogon" type="win32cui">\r
+       <include base="winlogon">.</include>\r
+       <define name="UNICODE" />\r
+       <define name="_UNICODE" />\r
+       <define name="__USE_W32API" />\r
+       <library>ntdll</library>\r
+       <library>kernel32</library>\r
+       <library>user32</library>\r
+       <library>advapi32</library>\r
+       <library>userenv</library>\r
+       <library>secur32</library>\r
+       <file>sas.c</file>\r
+       <file>setup.c</file>\r
+       <file>winlogon.c</file>\r
+       <file>wlx.c</file>\r
+       <file>winlogon.rc</file>\r
+</module>\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 8923afd..fbfa609 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -724,7 +724,9 @@ MingwModuleHandler::GenerateCommands ( const Module& module,
                                     cflagsMacro );\r
                return;\r
        }\r
-       else if ( extension == ".cc" || extension == ".CC" || extension == ".cxx" || extension == ".CXX" )\r
+       else if ( extension == ".cc" || extension == ".CC" ||\r
+                 extension == ".cpp" || extension == ".CPP" ||\r
+                 extension == ".cxx" || extension == ".CXX" )\r
        {\r
                GenerateGccCommand ( module,\r
                                     sourceFilename,\r
@@ -1259,6 +1261,16 @@ MingwModuleHandler::GetLinkingDependencies ( const Module& module ) const
        return dependencies;\r
 }\r
 \r
+bool\r
+MingwModuleHandler::IsCPlusPlusModule ( const Module& module ) const\r
+{\r
+       if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) )\r
+               return true;\r
+       if ( module.HasFileWithExtensions ( ".cpp", ".CPP" ) )\r
+               return true;\r
+       return false;\r
+}\r
+\r
 \r
 static MingwBuildToolModuleHandler buildtool_handler;\r
 \r
@@ -1285,7 +1297,7 @@ MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ( const Module& modul
        GenerateMacrosAndTargetsHost ( module );\r
 \r
        string linker;\r
-       if ( module.HasFileWithExtensions ( ".cxx", ".CXX" ) )\r
+       if ( IsCPlusPlusModule ( module ) )\r
                linker = "${host_gpp}";\r
        else\r
                linker = "${host_gcc}";\r
@@ -1698,7 +1710,7 @@ MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ( const Module& module
                          linkingDependencies.c_str () );\r
 \r
                string linker;\r
-               if ( module.HasFileWithExtensions ( ".cc", ".CC" ) || module.HasFileWithExtensions ( ".cxx", ".CXX" ) )\r
+               if ( IsCPlusPlusModule ( module ) )\r
                        linker = "${gpp}";\r
                else\r
                        linker = "${gcc}";\r
@@ -1807,10 +1819,16 @@ MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ( const Module& module
                          objectFilenames.c_str (),\r
                          importLibraryDependencies.c_str () );\r
 \r
+               string linker;\r
+               if ( IsCPlusPlusModule ( module ) )\r
+                       linker = "${gpp}";\r
+               else\r
+                       linker = "${gcc}";\r
+\r
                string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",\r
                                                     module.entrypoint.c_str () );\r
                GenerateLinkerCommand ( module,\r
-                                       "${gcc}",\r
+                                       linker,\r
                                        linkerParameters,\r
                                        objectFilenames );\r
        }\r

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index 85fd442..00d4291 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -62,6 +62,7 @@ protected:
        void GenerateImportLibraryTargetIfNeeded ( const Module& module ) const;\r
        std::string GetDefinitionDependencies ( const Module& module ) const;\r
        std::string GetLinkingDependencies ( const Module& module ) const;\r
+       bool IsCPlusPlusModule ( const Module& module ) const;\r
        static FILE* fMakefile;\r
        static std::set<std::string> directory_set;\r
 private:\r