Trivial fixes for Visual Studio (#299)

* Added Resharper C++ cache folder to .gitignore. * Fixed missing <algorithm> includes in Visual Studio.
spring · Mar 10, 2017 · 8cda0f2 · 8cda0f2
1 parent b569ed7
commit 8cda0f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,6 +62,7 @@ progress.make
 /rts/build/vstudio10/Release with error catching
 /rts/build/vstudio10/Release+MT with error catching
 /rts/build/vstudio10/Syncdebug
+/_ReSharper.Caches
 
 # Windows libraries used by spring when compiling with MinGW
 # recommended: place the dir somewhere else, and specify with

diff --git a/rts/Game/Players/PlayerHandler.cpp b/rts/Game/Players/PlayerHandler.cpp
@@ -8,6 +8,7 @@
 #include "Sim/Misc/GlobalConstants.h"
 #include "Game/GameSetup.h"
 #include "Game/SelectedUnitsHandler.h"
+#include <algorithm>
 
 CR_BIND(CPlayerHandler,)
 

diff --git a/rts/Rendering/GL/Light.h b/rts/Rendering/GL/Light.h
@@ -6,6 +6,7 @@
 #include "System/Object.h"
 #include "System/float3.h"
 #include "System/float4.h"
+#include <algorithm>
 
 namespace GL {
 	struct Light: public CObject {

diff --git a/rts/Sim/MoveTypes/MoveType.h b/rts/Sim/MoveTypes/MoveType.h
@@ -6,6 +6,7 @@
 #include "System/creg/creg_cond.h"
 #include "System/Object.h"
 #include "System/float3.h"
+#include <algorithm>
 
 class CUnit;