Permalink
Browse files

Fix vs2015.sln and vs2013.sln compile.

For whatever reason, #include simulationcraft.hpp must be first inside of sc_report_html_sim.cpp
  • Loading branch information...
1 parent 5e5fa4c commit b7e6172abcb9e7ec26ab3df9908c3c05b17e1ffb @Collisionc Collisionc committed Oct 11, 2016
Showing with 5 additions and 5 deletions.
  1. +1 −1 engine/report/sc_report_html_sim.cpp
  2. +2 −2 source_files/VS_engine.props
  3. +1 −1 vs/simc_vs2015.vcxproj
  4. +1 −1 vs/simcqt_vs2015.vcxproj
@@ -3,10 +3,10 @@
// Send questions to natehieter@gmail.com
// ==========================================================================
+#include "simulationcraft.hpp"
#include "sc_report.hpp"
#include "data/report_data.inc"
#include "interfaces/sc_js.hpp"
-#include "simulationcraft.hpp"
// Experimental Raw Ability Output for Blizzard to do comparisons
namespace raw_ability_summary
@@ -180,7 +180,7 @@ To change the list of source files, update the QT_ files and run synchronize.py
</ClCompile>
<ClCompile Include="..\engine\class_modules\sc_warlock.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
+
</ClCompile>
<ClCompile Include="..\engine\class_modules\sc_shaman.cpp">
@@ -192,7 +192,7 @@ To change the list of source files, update the QT_ files and run synchronize.py
</ClCompile>
<ClCompile Include="..\engine\class_modules\sc_paladin.cpp">
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
+
</ClCompile>
<ClCompile Include="..\engine\class_modules\sc_monk.cpp">
@@ -19,7 +19,7 @@
<RootNamespace>simc</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>simc</ProjectName>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WebEngine|x64'" Label="Configuration">
@@ -21,7 +21,7 @@
<ProjectName>SimcGUI_qt5.7.0</ProjectName>
<LocalDebuggerEnvironment>_NO_DEBUG_HEAP=1</LocalDebuggerEnvironment>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
- <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='WebEngine|x64'" Label="Configuration">

0 comments on commit b7e6172

Please sign in to comment.