mirror of
https://github.com/reactos/reactos.git
synced 2024-06-27 16:31:30 +00:00
00ed4c1394
Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted this revision modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/modulehandler.cpp modified tools/rbuild/module.cpp modified tools/rbuild/project.dtd modified tools/rbuild/rbuild.h modified include/crt/_mingw.h New module attribute iscrt for marking modules that implement a C runtime library New module attribute crt for compiling and linking modules to a specific C runtime library. Can be "ntdll" (for ntdll.dll) "msvcrt" (msvcrt.dll), "crt" (statically-linked runtime), "libcntpr" (libcntpr.lib), "dll" (one of the <library> entries specifies a CRT DLL) or "static". Defaults to "msvcrt" for Win32 modules, to "static" for CRT modules themselves, and to "dll" for drivers Define _DLL for code that compiles against a dynamically-linked CRT Define __MINGW_IMPORT and _CRTIMP according to whether _DLL is defined. We finally use __declspec(dllimport) somewhere, anywhere (SDK headers still don't use it) Bonus fix: actually use compiler-specific command line flags when compiling files modified lib/3rdparty/adns/adns.rbuild modified lib/3rdparty/libxml2/libxml2.rbuild modified lib/3rdparty/mingw/mingw.rbuild And for the downside: static libraries that will be linked to a module that links to the CRT dynamically have to be compiled for a dynamically-linked CRT, as well. Say it out aloud. modified base/applications/wordpad/wordpad.rbuild modified base/setup/usetup/usetup.rbuild modified dll/3rdparty/dxtn/dxtn.rbuild modified dll/3rdparty/freetype/freetype.rbuild modified dll/3rdparty/mesa32/mesa32.rbuild modified dll/cpl/desk/desk.rbuild modified dll/cpl/input/input.rbuild modified dll/cpl/intl/intl.rbuild modified dll/cpl/joy/joy.rbuild modified dll/cpl/main/main.rbuild modified dll/cpl/mmsys/mmsys.rbuild modified dll/cpl/odbccp32/odbccp32.rbuild modified dll/cpl/powercfg/powercfg.rbuild modified dll/cpl/sysdm/sysdm.rbuild modified dll/cpl/telephon/telephon.rbuild modified dll/cpl/timedate/timedate.rbuild modified dll/cpl/usrmgr/usrmgr.rbuild modified dll/directx/ddraw/ddraw.rbuild modified dll/directx/dsound/dsound.rbuild modified dll/directx/wine/wined3d/wined3d.rbuild modified dll/nls/idndl_redist/idndl_redist.rbuild modified dll/nls/normaliz_redist/normaliz_redist.rbuild modified dll/shellext/deskadp/deskadp.rbuild modified dll/shellext/deskmon/deskmon.rbuild modified dll/shellext/fontext/fontext.rbuild modified dll/win32/dhcpcsvc/dhcpcsvc.rbuild modified dll/win32/dnsapi/dnsapi.rbuild modified dll/win32/glu32/glu32.rbuild modified dll/win32/icmp/icmp.rbuild modified dll/win32/winmm/midimap/midimap.rbuild modified drivers/video/displays/framebuf/framebuf.rbuild modified drivers/video/displays/framebufacc/framebufacc.rbuild modified drivers/video/displays/vga/vgaddi.rbuild modified subsystems/win32/csrss/csrss.rbuild modified subsystems/win32/csrss/win32csr/win32csr.rbuild modified subsystems/win32/win32k/win32k.rbuild Don't specify msvcrt explicitely as a <library> if it's going to be linked implicitely as the CRT <library>libcntpr</library> -> crt="libcntpr" Remove miscellaneous unused <library> entries modified dll/win32/crtdll/crtdll.rbuild modified dll/win32/msvcrt20/msvcrt20.rbuild modified dll/win32/msvcrt40/msvcrt40.rbuild modified dll/win32/msvcrt/msvcrt.rbuild Mark CRT DLLs as CRT modules modified dll/win32/user32/windows/font.c modified include/reactos/wine/unicode.h Don't redefine or redeclare CRT functions modified dll/win32/ws2_32/include/ws2_32.h Arch, you idiot, it's defined in <stdlib.h> modified include/crt/ctype.h modified include/crt/wctype.h Don't import ctype routines that were already defined as inlines modified include/crt/stdio.h modified include/reactos/wine/config.h Avoid linking to libmingwex.a if possible modified base/applications/taskmgr/taskmgr.rbuild modified tools/nci/nci.mak modified tools/nci/ncitool.c modified dll/ntdll/ntdll.rbuild Mark ntdll module as a CRT New "ntsys" module to import just Nt/Zw from ntdll.dll. Avoids accidentally linking to ntdll.dll's CRT when importing system calls modified include/psdk/winternl.h Nope, it doesn't. modified base/applications/network/net/help.c modified base/applications/network/net/main.c Replace printf with puts, or GCC will do it on its own and link to the dllimport thunk for puts modified base/applications/network/ping/ping.c Removed broken, unnecessary workaround modified base/shell/cmd/cmd.rbuild Simplify cmd module This commit dediHAPPY BIRTHDAY STEFAN GINSBERG <3 <3 <3 svn path=/trunk/; revision=37187
78 lines
2 KiB
Ruby
78 lines
2 KiB
Ruby
<?xml version="1.0"?>
|
|
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
|
|
<group>
|
|
<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" unicode="yes">
|
|
<include base="ReactOS">include/reactos/wine</include>
|
|
<include base="cmd">.</include>
|
|
<define name="ANONYMOUSUNIONS" />
|
|
<define name="_DEBUG_MEM" />
|
|
<library>wine</library>
|
|
<library>kernel32</library>
|
|
<library>advapi32</library>
|
|
<library>shell32</library>
|
|
<library>user32</library>
|
|
<file>cmd.rc</file>
|
|
<file>main.c</file>
|
|
<pch>precomp.h</pch>
|
|
<compilationunit name="unit.c">
|
|
<file>alias.c</file>
|
|
<file>attrib.c</file>
|
|
<file>batch.c</file>
|
|
<file>beep.c</file>
|
|
<file>call.c</file>
|
|
<file>chcp.c</file>
|
|
<file>choice.c</file>
|
|
<file>cls.c</file>
|
|
<file>cmd.c</file>
|
|
<file>cmddbg.c</file>
|
|
<file>cmdinput.c</file>
|
|
<file>cmdtable.c</file>
|
|
<file>color.c</file>
|
|
<file>console.c</file>
|
|
<file>copy.c</file>
|
|
<file>date.c</file>
|
|
<file>del.c</file>
|
|
<file>delay.c</file>
|
|
<file>dir.c</file>
|
|
<file>dirstack.c</file>
|
|
<file>echo.c</file>
|
|
<file>error.c</file>
|
|
<file>filecomp.c</file>
|
|
<file>for.c</file>
|
|
<file>free.c</file>
|
|
<file>goto.c</file>
|
|
<file>history.c</file>
|
|
<file>if.c</file>
|
|
<file>internal.c</file>
|
|
<file>label.c</file>
|
|
<file>locale.c</file>
|
|
<file>memory.c</file>
|
|
<file>misc.c</file>
|
|
<file>move.c</file>
|
|
<file>msgbox.c</file>
|
|
<file>parser.c</file>
|
|
<file>path.c</file>
|
|
<file>pause.c</file>
|
|
<file>prompt.c</file>
|
|
<file>redir.c</file>
|
|
<file>ren.c</file>
|
|
<file>replace.c</file>
|
|
<file>screen.c</file>
|
|
<file>set.c</file>
|
|
<file>setlocal.c</file>
|
|
<file>shift.c</file>
|
|
<file>start.c</file>
|
|
<file>strtoclr.c</file>
|
|
<file>time.c</file>
|
|
<file>timer.c</file>
|
|
<file>title.c</file>
|
|
<file>type.c</file>
|
|
<file>ver.c</file>
|
|
<file>verify.c</file>
|
|
<file>vol.c</file>
|
|
<file>where.c</file>
|
|
<file>window.c</file>
|
|
</compilationunit>
|
|
</module>
|
|
</group>
|