- Remove getopt from mingw lib and put it into it's own static library
- change crt="dll" to crt="static" for the mingw startup libs, to avoid things like importing from itself.

svn path=/trunk/; revision=48181
This commit is contained in:
Timo Kreuzer 2010-07-22 09:20:03 +00:00
parent ba1b8c6dad
commit ca9e196050
2 changed files with 7 additions and 4 deletions

View file

@ -9,6 +9,7 @@
<include base="libtiff">.</include>
<include base="ReactOS">include/reactos/libs/zlib</include>
<include base="ReactOS">include/reactos/libs/libtiff</include>
<library>getopt</library>
<library>user32</library>
<library>zlib</library>
<file>mkg3states.c</file>

View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group>
<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="static">
<library>oldnames</library>
<library>ntdll</library>
<define name="_CRTBLD" />
@ -22,7 +22,6 @@
<file>crt_handler.c</file>
<file>dllentry.c</file>
<file>gccmain.c</file>
<file>getopt.c</file>
<file>gs_support.c</file>
<file>merr.c</file>
<file>mingw_helpers.c</file>
@ -49,7 +48,7 @@
<file>crtexe.c</file>
<file>dllargv.c</file>
</module>
<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="dll">
<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" unicode="yes" crt="static">
<define name="_CRTBLD" />
<define name="WPRFLAG" />
<include base="ReactOS">include/reactos/mingw-w64</include>
@ -58,7 +57,7 @@
<file>crtexe.c</file>
<file>dllargv.c</file>
</module>
<module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll">
<module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="static">
<define name="_CRTBLD" />
<include base="ReactOS">include/reactos/mingw-w64</include>
<file>crtdll.c</file>
@ -68,4 +67,7 @@
<define name="_CRTBLD" />
<importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
</module>
<module name="getopt" type="staticlibrary" crt="dll">
<file>getopt.c</file>
</module>
</group>