Skip to content

Commit da21660

Browse files
committed
Use official MSVC mechanism for calling MASM instead of custom build commands
1 parent 488ba95 commit da21660

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

source/angelscript/projects/msvc10/angelscript.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
2828
<ImportGroup Label="ExtensionSettings">
29+
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
2930
</ImportGroup>
3031
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
3132
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -156,15 +157,14 @@
156157
<ClInclude Include="..\..\source\as_variablescope.h" />
157158
</ItemGroup>
158159
<ItemGroup>
159-
<CustomBuild Include="..\..\source\as_callfunc_x64_msvc_asm.asm">
160-
<FileType>Document</FileType>
161-
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ml64.exe /c /nologo /Fo$(IntDir)as_callfunc_x64_msvc_asm.obj /W3 /Zi /Ta %(RootDir)%(Directory)\%(Filename)%(Extension)</Command>
162-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)as_callfunc_x64_msvc_asm.obj;%(Outputs)</Outputs>
163-
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ml64.exe /c /nologo /Fo$(IntDir)as_callfunc_x64_msvc_asm.obj /W3 /Zi /Ta %(RootDir)%(Directory)\%(Filename)%(Extension)</Command>
164-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)as_callfunc_x64_msvc_asm.obj;%(Outputs)</Outputs>
165-
</CustomBuild>
160+
<MASM Include="..\..\source\as_callfunc_x64_msvc_asm.asm">
161+
<ExcludedFromBuild>true</ExcludedFromBuild>
162+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
163+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
164+
</MASM>
166165
</ItemGroup>
167166
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
168167
<ImportGroup Label="ExtensionTargets">
168+
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
169169
</ImportGroup>
170-
</Project>
170+
</Project>

source/angelscript/projects/msvc10/angelscript.vcxproj.filters

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
</ClInclude>
218218
</ItemGroup>
219219
<ItemGroup>
220-
<CustomBuild Include="..\..\source\as_callfunc_x64_msvc_asm.asm">
220+
<MASM Include="..\..\source\as_callfunc_x64_msvc_asm.asm">
221221
<Filter>Source Files</Filter>
222-
</CustomBuild>
222+
</MASM>
223223
</ItemGroup>
224224
</Project>

0 commit comments

Comments
 (0)