Author: tkreuzer Date: Mon Mar 29 01:06:36 2010 New Revision: 46534
URL: http://svn.reactos.org/svn/reactos?rev=46534&view=rev Log: [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/f... ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE directory SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_arch" type="objectlibrary"> +<module name="freeldr_arch" type="objectlibrary" crt="static"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> <include base="ntoskrnl">include</include>
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/f... ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_base" type="objectlibrary"> +<module name="freeldr_base" type="objectlibrary" crt="static"> <include base="freeldr_base">include</include> <include base="freeldr_base">cache</include> <include base="cmlib">.</include>
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/f... ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_main" type="objectlibrary"> +<module name="freeldr_main" type="objectlibrary" crt="static"> <include base="freeldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" />
Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/f... ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupldr_main" type="objectlibrary"> +<module name="setupldr_main" type="objectlibrary" crt="static"> <include base="setupldr_main">include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" />
Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/nt... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -12,6 +12,7 @@ <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_NTOSKRNL_" /> + <define name="CRTDLL" /> <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -5,6 +5,7 @@ <define name="USE_MSVCRT_PREFIX" /> <define name="_MSVCRT_LIB_" /> <define name="_MSVCRT_" /> + <define name="CRTDLL" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" />
Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -8,6 +8,7 @@ <define name="_MT" /> <define name="_CTYPE_DISABLE_MACROS" /> <define name="_NO_INLINING" /> + <define name="CRTDLL" /> <linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
<!-- __MINGW_IMPORT needs to be defined differently because it's defined
Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt20/msvcrt20.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -6,6 +6,7 @@ <include base="msvcrt20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="CRTDLL" /> <file>msvcrt20.c</file> <library>wine</library> <library>msvcrt</library>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/wi... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msvcrt40/msvcrt40.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -6,6 +6,7 @@ <include base="msvcrt40">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> + <define name="CRTDLL" /> <file>msvcrt40.c</file> <library>wine</library> </module>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -57,7 +57,7 @@ </directory> </module>
- <module name="mini_hal" type="objectlibrary"> + <module name="mini_hal" type="objectlibrary" crt="static"> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> @@ -100,7 +100,7 @@ <file>apic.c</file> <file>systimer.S</file> <file>usage.c</file> - </directory> + </directory> </if> </directory> <directory name="up">
Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/rt... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Mon Mar 29 01:06:36 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="rtl" type="staticlibrary"> +<module name="rtl" type="staticlibrary" crt="static"> <define name="_NTOSKRNL_" /> <define name="NO_RTL_INLINES" /> <define name="_NTSYSTEM_" />