mirror of
https://github.com/reactos/reactos.git
synced 2024-08-24 20:28:57 +00:00
Build fixes for MSVC, now mkhive can be built with MSVC again
svn path=/trunk/; revision=28822
This commit is contained in:
parent
a478151d4c
commit
bd36046a96
|
@ -21,13 +21,13 @@
|
||||||
#error Unknown compiler
|
#error Unknown compiler
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __fastcall
|
#if !defined(_MSC_VER) && !defined(__fastcall)
|
||||||
#define __fastcall __attribute__((fastcall))
|
#define __fastcall __attribute__((fastcall))
|
||||||
#endif
|
#endif
|
||||||
#ifndef __cdecl
|
#if !defined(_MSC_VER) && !defined(__cdecl)
|
||||||
#define __cdecl __attribute__((cdecl))
|
#define __cdecl __attribute__((cdecl))
|
||||||
#endif
|
#endif
|
||||||
#ifndef __stdcall
|
#if !defined(_MSC_VER) && !defined(__stdcall)
|
||||||
#define __stdcall __attribute__((stdcall))
|
#define __stdcall __attribute__((stdcall))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib/cmlib.a ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostglue.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o ../../obj-i386/lib/rtl/rtl.a $(NOINHERIT)"
|
AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)"
|
||||||
LinkIncremental="2"
|
LinkIncremental="2"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
SubSystem="1"
|
SubSystem="1"
|
||||||
|
@ -118,7 +118,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
AdditionalIncludeDirectories=""
|
AdditionalIncludeDirectories="../../include/ddk;../../include/psdk;../../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl"
|
||||||
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
|
PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
|
||||||
RuntimeLibrary="2"
|
RuntimeLibrary="2"
|
||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
AdditionalDependencies="kernel32.lib $(NOINHERIT)"
|
AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)"
|
||||||
LinkIncremental="1"
|
LinkIncremental="1"
|
||||||
GenerateDebugInformation="true"
|
GenerateDebugInformation="true"
|
||||||
SubSystem="1"
|
SubSystem="1"
|
||||||
|
|
Loading…
Reference in a new issue