project: Remove use of assembly.

ShiftMediaProject · Jan 16, 2017 · 3a062eb · 3a062eb
1 parent 4378611
commit 3a062eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 66 deletions.
diff --git a/SMP/libzlib.vcxproj b/SMP/libzlib.vcxproj
@@ -130,9 +130,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
+  <ImportGroup Label="ExtensionSettings" />
   <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" />
   </ImportGroup>
@@ -230,7 +228,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;ASMV;ASMINF;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>false</ExceptionHandling>
@@ -290,7 +288,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>false</ExceptionHandling>
@@ -345,7 +343,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;ASMV;ASMINF;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>false</ExceptionHandling>
@@ -403,7 +401,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_WIN32_WINNT=0x0600;_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <AdditionalIncludeDirectories>.\;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>false</ExceptionHandling>
@@ -462,7 +460,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;ASMV;ASMINF;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -535,7 +533,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;ASMV;ASMINF;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -608,7 +606,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -676,7 +674,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -744,7 +742,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;ASMV;ASMINF;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -814,7 +812,7 @@ del /f /q $(OutDir)\licenses\zlib.txt
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>ASMV;ASMINF;WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -893,9 +891,6 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <ClCompile Include="..\trees.c" />
     <ClCompile Include="..\uncompr.c" />
     <ClCompile Include="..\zutil.c" />
-    <ClCompile Include="..\contrib\masmx64\inffas8664.c">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\contrib\minizip\ioapi.c" />
     <ClCompile Include="..\contrib\minizip\iowin32.c">
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
@@ -920,30 +915,6 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <ClInclude Include="..\contrib\minizip\zip.h" />
     <ClInclude Include="zconf.h" />
   </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\contrib\masmx64\gvmat64.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-      <UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
-      <WarningLevel>0</WarningLevel>
-    </MASM>
-    <MASM Include="..\contrib\masmx64\inffasx64.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-      <UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
-      <WarningLevel>0</WarningLevel>
-    </MASM>
-    <MASM Include="..\contrib\masmx86\inffas32.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-      <UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
-      <WarningLevel>0</WarningLevel>
-      <AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
-    </MASM>
-    <MASM Include="..\contrib\masmx86\match686.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-      <UseSafeExceptionHandlers>true</UseSafeExceptionHandlers>
-      <AdditionalOptions>/coff %(AdditionalOptions)</AdditionalOptions>
-      <WarningLevel>0</WarningLevel>
-    </MASM>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\contrib\vstudio\vc11\zlib.rc">
       <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
@@ -955,7 +926,5 @@ del /f /q $(OutDir)\licenses\zlib.txt
     <None Include="..\contrib\vstudio\vc11\zlibvc.def" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/SMP/libzlib.vcxproj.filters b/SMP/libzlib.vcxproj.filters
@@ -13,12 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Source Files\asm_x64">
-      <UniqueIdentifier>{f2efda25-fefb-49f2-b55f-47ab54cf23fb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\asm_x86">
-      <UniqueIdentifier>{09911575-8bb4-4c74-a2dd-512326046c5c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\zlib">
       <UniqueIdentifier>{8dce421b-2476-4f42-83ac-f3866d35196d}</UniqueIdentifier>
     </Filter>
@@ -81,9 +75,6 @@
     <ClCompile Include="..\contrib\minizip\zip.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\contrib\masmx64\inffas8664.c">
-      <Filter>Source Files\asm_x64</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\zutil.h">
@@ -126,20 +117,6 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\contrib\masmx86\inffas32.asm">
-      <Filter>Source Files\asm_x86</Filter>
-    </MASM>
-    <MASM Include="..\contrib\masmx86\match686.asm">
-      <Filter>Source Files\asm_x86</Filter>
-    </MASM>
-    <MASM Include="..\contrib\masmx64\gvmat64.asm">
-      <Filter>Source Files\asm_x64</Filter>
-    </MASM>
-    <MASM Include="..\contrib\masmx64\inffasx64.asm">
-      <Filter>Source Files\asm_x64</Filter>
-    </MASM>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\contrib\vstudio\vc11\zlib.rc">
       <Filter>Resource Files</Filter>