Merge from amd64-branch:

[reactos.git] / reactos / lib / 3rdparty / mingw / mingw.rbuild

diff --git a/reactos/lib/3rdparty/mingw/mingw.rbuild b/reactos/lib/3rdparty/mingw/mingw.rbuild
index d32f3fe..a4b412e 100644 (file)
--- a/reactos/lib/3rdparty/mingw/mingw.rbuild
+++ b/reactos/lib/3rdparty/mingw/mingw.rbuild
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll">
-       <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
-       <include base="mingw_common">include</include>
-       <library>kernel32</library>
+<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
+       <define name="_CRTBLD" />
+
+       <!-- This is to prevent from using data imports directly -->
+       <define name="_M_CEE_PURE" />
+
+       <include base="ReactOS">include/reactos/mingw-w64</include>
+               <library>kernel32</library>
        <file>_newmode.c</file>
-       <file>_wgetopt.c</file>
        <file>atonexit.c</file>
-       <file>binmode.c</file>
        <file>charmax.c</file>
        <file>cinitexe.c</file>
        <file>CRT_fp10.c</file>
@@ -30,21 +32,30 @@
        <file>xtxtmode.c</file>
 </module>
 <module name="mingw_main" type="staticlibrary" isstartuplib="true" crt="dll">
-       <include base="mingw_common">include</include>
+       <define name="_CRTBLD" />
+       <include base="ReactOS">include/reactos/mingw-w64</include>
+       <compilerflag compilerset="msc">/wd4733</compilerflag>
        <file>crt0_c.c</file>
        <file>crtexe.c</file>
        <file>dllargv.c</file>
 </module>
 <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll">
-       <include base="mingw_common">include</include>
-       <define name="WPRFLAG"/>
+       <define name="_CRTBLD" />
+       <define name="WPRFLAG" />
+       <include base="ReactOS">include/reactos/mingw-w64</include>
+       <compilerflag compilerset="msc">/wd4733</compilerflag>
        <file>crt0_w.c</file>
        <file>crtexe.c</file>
        <file>dllargv.c</file>
 </module>
 <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll">
-       <include base="mingw_common">include</include>
-       <file>dllargv.c</file>
+       <define name="_CRTBLD" />
+       <include base="ReactOS">include/reactos/mingw-w64</include>
        <file>crtdll.c</file>
+       <file>dllargv.c</file>
+</module>
+<module name="oldnames" type="staticlibrary">
+       <define name="_CRTBLD" />
+       <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
 </module>
 </group>