commit 19e433d1ef79f93986d9b2751e3558826fbfd048
author Nicolas Capens <capn@google.com> Wed Jun 29 12:20:00 2016 -0400
committer Nicolas Capens <capn@google.com> Wed Jun 29 16:38:05 2016 +0000
tree 5fd45481e68cc7b62659126c952ba80c2d354363
parent 2b6a8da1c11834d3ca650db4d7b1a100e6497299

Suppress macro redefinition warnings treated as error.

Bug 29869215

Change-Id: Iedc281676fa6befd458c3a96a904024ec69d9741
Reviewed-on: https://swiftshader-review.googlesource.com/5730
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/Compiler.vcxproj

diff --git a/src/OpenGL/compiler/Compiler.vcxproj b/src/OpenGL/compiler/Compiler.vcxproj
index e1c7a23..d200207 100644
--- a/src/OpenGL/compiler/Compiler.vcxproj
+++ b/src/OpenGL/compiler/Compiler.vcxproj
@@ -124,6 +124,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <BrowseInformation>true</BrowseInformation>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <DisableSpecificWarnings>4005;</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -139,7 +140,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <BrowseInformation>true</BrowseInformation>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -154,6 +155,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <DisableSpecificWarnings>4005;</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -168,7 +170,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">

@@ -184,6 +186,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <OmitFramePointers>false</OmitFramePointers>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <DisableSpecificWarnings>4005;</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">

@@ -199,7 +202,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

       <OmitFramePointers>false</OmitFramePointers>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

src/OpenGL/compiler/preprocessor/preprocessor.vcxproj

diff --git a/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
index 16fb077..4bf80bf 100644
--- a/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
+++ b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
@@ -87,6 +87,7 @@
       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <DisableSpecificWarnings>4005;</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -98,7 +99,7 @@
       <Optimization>Disabled</Optimization>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -112,6 +113,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <TreatWarningAsError>true</TreatWarningAsError>

+      <DisableSpecificWarnings>4005;</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -127,7 +129,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <TreatWarningAsError>true</TreatWarningAsError>

-      <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>