tweak for precompiled headers

LordTy · Jan 3, 2015 · eb03bb7 · eb03bb7
1 parent 98cab00
commit eb03bb7
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 44 deletions.
diff --git a/msvc140/Cataclysm.vcxproj b/msvc140/Cataclysm.vcxproj
@@ -66,97 +66,92 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-
   <ItemGroup>
     <ClInclude Include="pch.hpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug SDL Tiles|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release SDL Tiles|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug SDL Tiles Localized|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release SDL Tiles Localized|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug Localized|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release Localized|Win32'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug SDL Tiles|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release SDL Tiles|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug SDL Tiles Localized|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release SDL Tiles Localized|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug Localized|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </ForcedIncludeFiles>
+      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release Localized|x64'">
+      </ForcedIncludeFiles>
     </ClCompile>
   </ItemGroup>
-
   <ItemGroup>
     <ClCompile Include="..\src\*.cpp" />
   </ItemGroup>
-
   <ItemGroup>
     <ClInclude Include="..\src\*.h" />
   </ItemGroup>
-
   <ItemGroup>
     <ResourceCompile Include="..\src\resource.rc" />
   </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FE1372AC-5F90-447E-BBCA-1B253836EB77}</ProjectGuid>
     <RootNamespace>Cataclysm</RootNamespace>
   </PropertyGroup>
-
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
   <ImportGroup Label="PropertySheets">
     <Import Project="common.props" />
     <Import Project="precompile.props" />
   </ImportGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-
-  <ImportGroup Label="PropertySheets"
-    Condition="'$(Configuration)'=='Debug'
-            Or '$(Configuration)'=='Debug Localized'
-            Or '$(Configuration)'=='Debug SDL Tiles'
-            Or '$(Configuration)'=='Debug SDL Tiles Localized'
-  ">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)'=='Debug'&#xD;&#xA;            Or '$(Configuration)'=='Debug Localized'&#xD;&#xA;            Or '$(Configuration)'=='Debug SDL Tiles'&#xD;&#xA;            Or '$(Configuration)'=='Debug SDL Tiles Localized'&#xD;&#xA;  ">
     <Import Project="debug.props" />
   </ImportGroup>
-
-  <ImportGroup Label="PropertySheets"
-    Condition="'$(Configuration)'=='Release'
-            Or '$(Configuration)'=='Release Localized'
-            Or '$(Configuration)'=='Release SDL Tiles'
-            Or '$(Configuration)'=='Release SDL Tiles Localized'
-  ">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)'=='Release'&#xD;&#xA;            Or '$(Configuration)'=='Release Localized'&#xD;&#xA;            Or '$(Configuration)'=='Release SDL Tiles'&#xD;&#xA;            Or '$(Configuration)'=='Release SDL Tiles Localized'&#xD;&#xA;  ">
     <Import Project="optimize.props" />
   </ImportGroup>
-
-  <ImportGroup Label="PropertySheets"
-    Condition="'$(Configuration)'=='Debug SDL Tiles'
-            Or '$(Configuration)'=='Debug SDL Tiles Localized'
-            Or '$(Configuration)'=='Release SDL Tiles'
-            Or '$(Configuration)'=='Release SDL Tiles Localized'
-  ">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)'=='Debug SDL Tiles'&#xD;&#xA;            Or '$(Configuration)'=='Debug SDL Tiles Localized'&#xD;&#xA;            Or '$(Configuration)'=='Release SDL Tiles'&#xD;&#xA;            Or '$(Configuration)'=='Release SDL Tiles Localized'&#xD;&#xA;  ">
     <Import Project="sdl.props" />
   </ImportGroup>
-
-  <ImportGroup Label="PropertySheets"
-    Condition="'$(Configuration)'=='Debug Localized'
-            Or '$(Configuration)'=='Debug SDL Tiles Localized'
-            Or '$(Configuration)'=='Release Localized'
-            Or '$(Configuration)'=='Release SDL Tiles Localized'
-  ">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)'=='Debug Localized'&#xD;&#xA;            Or '$(Configuration)'=='Debug SDL Tiles Localized'&#xD;&#xA;            Or '$(Configuration)'=='Release Localized'&#xD;&#xA;            Or '$(Configuration)'=='Release SDL Tiles Localized'&#xD;&#xA;  ">
     <Import Project="localize.props" />
   </ImportGroup>
-
   <PropertyGroup Condition="'$(BuildConfig)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(BuildConfig)'=='Release'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>getversion.cmd</Command>
@@ -165,5 +160,4 @@
       <Message>Generate version.h</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
-
 </Project>
diff --git a/msvc140/common.props b/msvc140/common.props
@@ -9,13 +9,17 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0601;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <WarningLevel>Level1</WarningLevel>
       <SDLCheck>false</SDLCheck>
       <StringPooling>true</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
       <CompileAs>CompileAsCpp</CompileAs>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <AdditionalOptions>/Zc:inline /Zc:rvalueCast /Zc:strictStrings %(AdditionalOptions)</AdditionalOptions>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
+      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4819</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/msvc140/pch.cpp b/msvc140/pch.cpp
@@ -0,0 +1 @@
+#include "pch.hpp"
diff --git a/msvc140/precompile.props b/msvc140/precompile.props
@@ -13,7 +13,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeaderFile>pch.hpp</PrecompiledHeaderFile>
-      <ForcedIncludeFiles>pch.hpp</ForcedIncludeFiles>
+      <ForcedIncludeFiles>pch.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />