diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2014-06-04 01:31:18 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2014-06-04 21:34:32 +0400 |
| commit | 1505c43d70a0b6d46e676f1fa63a4380f75b517e (patch) | |
| tree | a803286b747741caf1f90a0500e1d08ea9c717be /msvc/libmonoutils.vcxproj | |
| parent | d248c1516b3e572aeb78827a508bb6f8800ef82a (diff) | |
[win64] Windows64 MSVC compiler dropped support for inline assembly. Move that code into a .asm file.
Diffstat (limited to 'msvc/libmonoutils.vcxproj')
| -rw-r--r-- | msvc/libmonoutils.vcxproj | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index e0deda357a7..b760ab76971 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -128,6 +128,11 @@ <ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
<ClInclude Include="..\mono\utils\bsearch.h" />
</ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\mono\utils\win64.asm">
+ <FileType>Document</FileType>
+ </MASM>
+ </ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8FC2B0C8-51AD-49DF-851F-5D01A77A75E4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
@@ -160,6 +165,7 @@ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -223,6 +229,9 @@ <PreBuildEvent>
<Command>winsetup.bat</Command>
</PreBuildEvent>
+ <MASM>
+ <PreprocessorDefinitions>X64</PreprocessorDefinitions>
+ </MASM>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -268,5 +277,6 @@ </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file |