Merge pull request #4524 from thedax/fixWindows

Fix Windows build, and VS2013 build.
This commit is contained in:
Henrik Rydgård 2013-11-12 16:05:36 -08:00
commit a2748c074c
4 changed files with 3 additions and 7 deletions

View file

@ -192,7 +192,6 @@
<ClInclude Include="StdMutex.h" />
<ClInclude Include="StringUtils.h" />
<ClInclude Include="Swap.h" />
<ClInclude Include="Thread.h" />
<ClInclude Include="ThreadPools.h" />
<ClInclude Include="Thunk.h" />
<ClInclude Include="Timer.h" />
@ -228,7 +227,6 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="Thread.cpp" />
<ClCompile Include="ThreadPools.cpp" />
<ClCompile Include="Thunk.cpp" />
<ClCompile Include="Timer.cpp" />
@ -246,4 +244,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View file

@ -23,7 +23,6 @@
<ClInclude Include="StdConditionVariable.h" />
<ClInclude Include="StdMutex.h" />
<ClInclude Include="StringUtils.h" />
<ClInclude Include="Thread.h" />
<ClInclude Include="Thunk.h" />
<ClInclude Include="Timer.h" />
<ClInclude Include="x64Analyzer.h" />
@ -53,7 +52,6 @@
<ClCompile Include="Misc.cpp" />
<ClCompile Include="MsgHandler.cpp" />
<ClCompile Include="StringUtils.cpp" />
<ClCompile Include="Thread.cpp" />
<ClCompile Include="Thunk.cpp" />
<ClCompile Include="Timer.cpp" />
<ClCompile Include="x64Analyzer.cpp" />
@ -78,4 +76,4 @@
<UniqueIdentifier>{1b593f03-7b28-4707-9228-4981796f5589}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
</Project>

View file

@ -18,6 +18,7 @@
#include <vector>
#include <map>
#include <cmath>
#include <algorithm>
// TODO: Move the relevant parts into common. Don't want the core
// to be dependent on "native", I think. Or maybe should get rid of common

View file

@ -30,7 +30,6 @@
#include "Common/LogManager.h"
#include "Common/ConsoleListener.h"
#include "Common/Thread.h"
#include "Commctrl.h"