[MINGW]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 22 Jul 2010 09:20:03 +0000 (09:20 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 22 Jul 2010 09:20:03 +0000 (09:20 +0000)
- 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

reactos/dll/3rdparty/libtiff/libtiff.rbuild
reactos/lib/3rdparty/mingw/mingw.rbuild

index 1f37bc4..ce7027c 100644 (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>
        <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>
        <library>user32</library>
        <library>zlib</library>
        <file>mkg3states.c</file>
index b851473..737810c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <?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" />
        <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>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>
        <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>
        <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>
        <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>
        <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>
        <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>
        <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>
 </group>