fixed vs2010

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 9374dae23a95744caffa43e26ab5a4c22831b1e0
+node: ca9fc754227a83436c0231e36ad75de1f9118009
 branch: default
 latesttag: oldrender
-latesttagdistance: 542
+latesttagdistance: 543

oxygine/SDL/win32/oxygine_vs2010.vcxproj

@@ -113,7 +113,6 @@
     <ClCompile Include="..\..\src\core\ImageDataOperations.cpp" />
     <ClCompile Include="..\..\src\core\log.cpp" />
     <ClCompile Include="..\..\src\core\Mem2Native.cpp" />
-    <ClCompile Include="..\..\src\core\memory_pool.cpp" />
     <ClCompile Include="..\..\src\core\Mutex.cpp" />
     <ClCompile Include="..\..\src\core\NativeTexture.cpp" />
     <ClCompile Include="..\..\src\core\Object.cpp" />
@@ -158,6 +157,7 @@
     <ClCompile Include="..\..\src\res\Resource.cpp" />
     <ClCompile Include="..\..\src\res\Resources.cpp" />
     <ClCompile Include="..\..\src\res\ResStarlingAtlas.cpp" />
+    <ClCompile Include="..\..\src\Serializable.cpp" />
     <ClCompile Include="..\..\src\Serialize.cpp" />
     <ClCompile Include="..\..\src\SlidingActor.cpp" />
     <ClCompile Include="..\..\src\Sprite.cpp" />
@@ -167,7 +167,8 @@
     <ClCompile Include="..\..\src\text_utils\Aligner.cpp" />
     <ClCompile Include="..\..\src\text_utils\Node.cpp" />
     <ClCompile Include="..\..\src\text_utils\TextBuilder.cpp" />
-    <ClCompile Include="..\..\src\Tweener.cpp" />
+    <ClCompile Include="..\..\src\Tween.cpp" />
+    <ClCompile Include="..\..\src\TweenQueue.cpp" />
     <ClCompile Include="..\..\src\utils\stringUtils.cpp" />
     <ClCompile Include="..\..\src\math\AffineTransform.cpp" />
     <ClCompile Include="..\..\src\pugixml\pugixml.cpp" />
@@ -203,7 +204,6 @@
     <ClInclude Include="..\..\src\core\log.h" />
     <ClInclude Include="..\..\src\core\logging.h" />
     <ClInclude Include="..\..\src\core\Mem2Native.h" />
-    <ClInclude Include="..\..\src\core\memory_pool.h" />
     <ClInclude Include="..\..\src\core\Mutex.h" />
     <ClInclude Include="..\..\src\core\NativeTexture.h" />
     <ClInclude Include="..\..\src\core\Object.h" />
@@ -237,6 +237,7 @@
     <ClInclude Include="..\..\src\InitActor.h" />
     <ClInclude Include="..\..\src\Input.h" />
     <ClInclude Include="..\..\src\InputText.h" />
+    <ClInclude Include="..\..\src\KeyEvent.h" />
     <ClInclude Include="..\..\src\MaskedRenderer.h" />
     <ClInclude Include="..\..\src\MaskedSprite.h" />
     <ClInclude Include="..\..\src\MemoryTexture.h" />
@@ -245,9 +246,11 @@
     <ClInclude Include="..\..\src\minizip\unzip.h" />
     <ClInclude Include="..\..\src\Multithreading.h" />
     <ClInclude Include="..\..\src\oxygine-framework.h" />
+    <ClInclude Include="..\..\src\oxygine_include.h" />
     <ClInclude Include="..\..\src\PointerState.h" />
     <ClInclude Include="..\..\src\Polygon.h" />
     <ClInclude Include="..\..\src\ProgressBar.h" />
+    <ClInclude Include="..\..\src\Property.h" />
     <ClInclude Include="..\..\src\RenderState.h" />
     <ClInclude Include="..\..\src\res\CreateResourceContext.h" />
     <ClInclude Include="..\..\src\res\ResAnim.h" />
@@ -259,6 +262,7 @@
     <ClInclude Include="..\..\src\res\Resources.h" />
     <ClInclude Include="..\..\src\res\ResStarlingAtlas.h" />
     <ClInclude Include="..\..\src\RootActor.h" />
+    <ClInclude Include="..\..\src\Serializable.h" />
     <ClInclude Include="..\..\src\Serialize.h" />
     <ClInclude Include="..\..\src\SlidingActor.h" />
     <ClInclude Include="..\..\src\Sprite.h" />
@@ -270,7 +274,10 @@
     <ClInclude Include="..\..\src\text_utils\Aligner.h" />
     <ClInclude Include="..\..\src\text_utils\Node.h" />
     <ClInclude Include="..\..\src\text_utils\TextBuilder.h" />
+    <ClInclude Include="..\..\src\TouchEvent.h" />
+    <ClInclude Include="..\..\src\Tween.h" />
     <ClInclude Include="..\..\src\Tweener.h" />
+    <ClInclude Include="..\..\src\TweenQueue.h" />
     <ClInclude Include="..\..\src\UpdateState.h" />
     <ClInclude Include="..\..\src\utils\stringUtils.h" />
     <ClInclude Include="..\..\src\closure\closure.h" />

oxygine/SDL/win32/oxygine_vs2010.vcxproj.filters

@@ -156,9 +156,6 @@
     <ClCompile Include="..\..\src\core\Mem2Native.cpp">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\core\memory_pool.cpp">
-      <Filter>src\core</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\core\Mutex.cpp">
       <Filter>src\core</Filter>
     </ClCompile>
@@ -258,9 +255,6 @@
     <ClCompile Include="..\..\src\Sprite.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\Tweener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\VisualStyle.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -300,6 +294,15 @@
     <ClCompile Include="..\..\src\STDRenderer.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Serializable.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\Tween.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\TweenQueue.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\closure\closure.h">
@@ -464,9 +467,6 @@
     <ClInclude Include="..\..\src\core\Mem2Native.h">
       <Filter>src\core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\core\memory_pool.h">
-      <Filter>src\core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\core\Mutex.h">
       <Filter>src\core</Filter>
     </ClInclude>
@@ -647,6 +647,27 @@
     <ClInclude Include="..\..\src\STDRenderer.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\KeyEvent.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine_include.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Property.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Serializable.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\TouchEvent.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Tween.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\TweenQueue.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/core/FileSystem.cpp

@@ -1,5 +1,6 @@
 #include "FileSystem.h"
 #include <string.h>
+#include <algorithm>
 
 namespace oxygine
 {

oxygine/src/core/Object.cpp

@@ -5,6 +5,7 @@
 #include "Mutex.h"
 #include "utils/stringUtils.h"
 #include <string.h>
+#include <algorithm>
 
 namespace oxygine
 {