updated VS solutions and readme

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 096eec250df8a0971ef7250f3a92bceaa2f3ff63
+node: f2da8be5c148d1baa35efdec6f60c0dceb453b81
 branch: default
 latesttag: oldrender
-latesttagdistance: 315
+latesttagdistance: 330

.hgignore

@@ -129,5 +129,6 @@ examples/Match3/data/*.dll
 examples/TutorialResources/data/*.dll
 examples/Demo/proj.win32/Win32/
 data.js
+examples/HelloWorld/proj.win32/Win32/
 syntax: regexp
 ^build/

doc.bat

@@ -1 +0,0 @@
-doxygen

doc/actors.md

@@ -0,0 +1,49 @@
+#Scene Graph
+Low level 2D frameworks provides you basic rendering functionality. Where you should draw images each frame by hands.
+ 
+Oxygine isn't low level 2D framework and in addition to this it provides own scene graph.
+
+##Example
+You could create Sprite, set position and image, attach it to scene and "forget". Sprite would be displayed and updated each frame automatically. You could say to this sprite "rotate on 360 degress for 2 secons 5 times and then remove self".
+
+	spSrite sprite = new Sprite;
+	sprite->attachTo(getRoot()); 
+	sprite->addTween(Sprite::TweenRotation(2*PI), 2000, 5)->setDetachActor(true);
+
+> it is pseudocode, you also should set to sprite "image" resource or it would be empty and invisible  
+> getRoot() returns root node of the scene graph
+
+you could create second *"child"* sprite attached to already created and they would be rotating both:
+
+	spSprite child = new Sprite;
+	child->attachTo(sprite);
+
+   
+ 
+ 
+![Actor inheritance](img/actor.gif)
+ 
+ 
+#Actors
+Actor is base class in scene graph. 
+Actor has properties:
+
+- transformation (position, scale, rotation)
+- size
+- name
+- list of children
+- list of added tweens 
+- etc
+
+
+You would widely use Sprites in your app.
+
+##Sprite
+Sprite is inhireted from Actor. Sprite = Actor + Image 
+
+##TextField
+TextField is used for displaying text.
+
+##Progress Bar
+Brogress Bar is used for displaying progress.
+

doc/custom_shaders.md

@@ -0,0 +1,12 @@
+#Shaders
+Oxygine shading is based on "Uber Shaders" system.
+
+Shader source is located here:
+*oxygine/system_data/original/system/shader.glsl*
+
+It is already embedded into Oxygine source code and can't be modified directly.
+If you want to change it then copy shader to Application data folder (working directory).
+
+##Example
+
+*examples/Demo/src/TestUserShader.h* has example how custom shaders could be created and added to the rendering pipeline.

doc/debug.md

@@ -0,0 +1,75 @@
+##DebugActor 
+DebugActor displays some usefull stats. Some of them available only in Debug mode:
+
+- **fps** - frames per second
+- **objects** - number of created instances of Object. Debug only, to enable it in release define OXYGINE_DEBUG_TRACE_LEAKS
+- **batches** - number of batches per frame (draw calls). Debug only, to enable it in release define OXYGINE_TRACE_VIDEO_STATS
+- **triangles** - number of triangles per frame
+- **update** - RootActor::update time in milliseconds. It includes all children updates
+- **render** - RootActor::render time in milliseconds. It includes all children rendering
+- **textures** - number of total created textures
+- **listeners** - number of event listeners attached to RootActor
+
+![](img/DebugActor.png)
+
+###Custom text
+To display custom text on DebugActor (image above) call it each frame:
+
+    DebugActor::instance->addDebugString("Custom text");
+
+###Tools
+**DebugActor** has 4 buttons from left to right:
+
+1. **Textures inspector** shows all created and not deleted textures. Debug only, to enable it in release define OXYGINE_DEBUG_TRACE_LEAKS
+2. **T2P** - Texel2Pixel. It shows "blurred" sprites displayed without texel to pixel precision on display
+3. **Finger** - Animates clicked actors under mouse cursor. Could be usefull to find out who blocked mouse events
+4. **Tree Inspector** show graph tree of actors with detailed info.
+
+#Logging
+**namespace log** has functions to print text to output. Include **log.h** 
+
+
+    log::messageln("it is message");
+    > it is message
+    
+    log::warning("it is warning");
+    > warning: it is warning
+    
+    log::error("it is error");
+    > error: it is error
+
+
+#Tracing Object leaks
+Helps you to find leaked Objects.
+ 
+> It is Debug only feature, to enable it in release mode define: OXYGINE_DEBUG_TRACE_LEAKS
+
+Guards to trace leaks:
+
+	ObjectBase::__startTracingLeaks();
+    new Actor;//leak
+	new Sprite;//leak
+	ObjectBase::__stopTracingLeaks();
+
+If you want to display all created and not deleted Objects call:
+
+	ObjectBase::dumpCreatedObjects();
+
+result: 
+
+	allocated objects:
+	id = 3, name = '', typeid = 'class oxygine::Actor', refs = 0
+	id = 4, name = '', typeid = 'class oxygine::Sprite', refs = 0
+	total: 2 -----------------------------
+
+There are some usefull functions:
+
+		/**Shows assert when object with this unique ID will be created.*/ 
+		ObjectBase::showAssertInCtor(int id);
+		/**Shows assert when object with this unique ID will be destroyed.*/
+		ObjectBase::showAssertInDtor(int id);
+
+**"id"** is numeric identifier which could be retrieved from "allocated objects" list 
+
+
+> Each example has leak guards (entry_point.cpp)

doc/fonts.md

@@ -0,0 +1,36 @@
+# Fonts
+Oxygine supports image based fonts rendering.
+Each font should be generated before running your application by *[BMFont](http://www.angelcode.com/products/bmfont/)* tool.
+Generated font consists of pair .png + .fnt file.
+![font example](img/font.png)
+
+BMFont tool is located here:
+**3rdPartyTools/BMFont/bmfont.exe**
+> for Linux/MacOSX users: BMFont could be launched with Wine
+
+
+##Exporting fonts
+1. Run **bmfont.exe**
+2. Select required symbols
+![](img/bmfont.png)
+3. Select font, size and other settings
+4. Export it *(Menu->Options->Save Bitmap Font As)* to folder with your app resources and add it to resources xml file	
+	`<font file="myfont.fnt" />`
+> see examples/HelloWorld/data/res.xml
+
+
+##Advanced usage
+Fonts could be automatically generated from BMFont configuration files (.bmfc) by **process_xml2.py** tool.
+
+Add this line to resources xml:
+
+    `<bmfc_font file="main.bmfc" chars="eng.txt"/>	`
+> see examples/Demo/data/demo/fonts.xml
+
+Where:
+
+- file="main.bmfc" is your BMFont configuration file
+- chars="eng.txt" is text (TF-16 LE encoding) with symbols to export
+
+
+> read more about process_xml2.py tool

doc/shaders.md

@@ -0,0 +1,12 @@
+#Shaders
+Oxygine shading is based on "Uber Shaders" system.
+
+Shader source is located here:
+*oxygine/system_data/original/system/shader.glsl*
+
+It is already embedded into Oxygine source code and can't be modified directly.
+If you want to change it then copy shader to Application data folder (working directory).
+
+##Example
+
+*examples/Demo/src/TestUserShader.h* has example how custom shaders could be created and added to the rendering pipeline.

examples/Demo/proj.win32/Demo_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_vs2010", "Demo_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Demo/proj.win32/Demo_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Demo/proj.win32/Demo_vs2013.sln

@@ -1,14 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_vs2013", "Demo_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo", "Demo_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygine_vs2013", "..\..\..\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,22 +21,6 @@ Global
 		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.ActiveCfg = Release|Win32
 		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.Build.0 = Release|Win32
 		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|x64.ActiveCfg = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
-		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
-		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.Build.0 = Debug|Win32
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|x64.ActiveCfg = Debug|Win32

examples/Demo/proj.win32/Demo_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/DemoBox2D/proj.marmalade/data/app.config.txt

@@ -1,10 +0,0 @@
-# This .config.txt file documents configuration settings for your
-# application
-# The syntax is similar to that in .icf files:
-#
-# [GroupName]
-# Setting     Documentation for setting
-#
-# e.g.
-# [MyApplicationGroup]
-# MySetting   Description of what MySetting is for, its default values, etc

examples/DemoBox2D/proj.marmalade/data/app.icf

@@ -1,17 +0,0 @@
-# This file is for configuration settings for your
-# application.
-#
-# The syntax is similar to windows .ini files ie
-#
-# [GroupName]
-# Setting = Value
-#
-# Which can be read by your application using
-#  e.g s3eConfigGetString("GroupName", "Setting", string)
-#
-# All settings must be documented in .config.txt files.
-# New settings specific to this application should be
-# documented in app.config.txt
-#
-# Some conditional operations are also permitted, see the
-# S3E documentation for details.

examples/Game/part1/proj.win32/GamePart1_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart1_vs2010", "GamePart1_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part1/proj.win32/GamePart1_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part1/proj.win32/GamePart1_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart1_vs2013", "GamePart1_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part1/proj.win32/GamePart1_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part2/proj.win32/GamePart2_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart2_vs2010", "GamePart2_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part2/proj.win32/GamePart2_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part2/proj.win32/GamePart2_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart2_vs2013", "GamePart2_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part2/proj.win32/GamePart2_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part3/proj.win32/GamePart3_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart3_vs2010", "GamePart3_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part3/proj.win32/GamePart3_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part3/proj.win32/GamePart3_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart3_vs2013", "GamePart3_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part3/proj.win32/GamePart3_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part4/proj.win32/GamePart4_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart4_vs2010", "GamePart4_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part4/proj.win32/GamePart4_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Game/part4/proj.win32/GamePart4_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GamePart4_vs2013", "GamePart4_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Game/part4/proj.win32/GamePart4_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../..//oxygine/third_party/win32/libraries;../../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/HelloWorld/proj.win32/HelloWorld_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld_vs2010", "HelloWorld_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/HelloWorld/proj.win32/HelloWorld_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/HelloWorld/proj.win32/HelloWorld_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloWorld_vs2013", "HelloWorld_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/HelloWorld/proj.win32/HelloWorld_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Match3/proj.win32/Match3_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Match3_vs2010", "Match3_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Match3/proj.win32/Match3_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/Match3/proj.win32/Match3_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Match3_vs2013", "Match3_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/Match3/proj.win32/Match3_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/TutorialResources/proj.win32/TutorialResources_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TutorialResources_vs2010", "TutorialResources_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/TutorialResources/proj.win32/TutorialResources_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

examples/TutorialResources/proj.win32/TutorialResources_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TutorialResources_vs2013", "TutorialResources_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

examples/TutorialResources/proj.win32/TutorialResources_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

oxygine/src/Actor.h

@@ -280,6 +280,7 @@ namespace oxygine
 		spTween _addTween(spTween tween, bool rel);
 
 		
+		/**doUpdate is virtual method for overloading in inherited classes. UpdateState struct has local time of Actor (relative to Clock) and delta time.*/
 		virtual void doUpdate(const UpdateState &us);
 		UpdateCallback _cbDoUpdate;
 		//RenderCallback _cbDoRender;

oxygine/src/blocking.cpp

@@ -25,6 +25,7 @@ namespace oxygine
 
 		int yield()
 		{
+			OX_ASSERT(_mainLoopFunc);
 #if OXYGINE_NO_YEILD
 			log::error("%s not supported", __func__);
 			return 0;

oxygine/src/core/ZipFileSystem.cpp

@@ -175,6 +175,10 @@ namespace file
 		if (!zp)
 			return;
 
+		zpitem item;
+		item.handle = zp;
+		_zps.push_back(item);
+
 		read(zp);
 	}
 
@@ -285,6 +289,7 @@ namespace file
 
 	void ZipFileSystem::add(const char *zip)
 	{
+		log::messageln("ZipFileSystem::add %s", zip);
 		_zips.add(zip);
 	}
 

oxygine/src/core/gl/oxgl.cpp

@@ -62,7 +62,11 @@ extern "C"
 
 	}
 	PFNGLSHADERSOURCEPROC _glShaderSource = 0;
+#if GL_GLEXT_VERSION == 64
+	GLAPI void APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar ** string, const GLint *length)
+#else
 	GLAPI void APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar * const* string, const GLint *length)
+#endif
 	{
 		_glShaderSource(shader, count, string, length);
 	}

readme.md

@@ -1,7 +1,7 @@
 **oxygine-framework/readme** folder has insructions how to build and run oxygine on different platforms.
 
 
-# Oxygine is C++ engine for 2d mobile games. 
+# Oxygine is C++ engine for 2D mobile games. 
 One more shell around OpenGL/D3D API you would say? No, this is a set of classes and tools to create a game according to your requirements.
 
 In the basis of the engine there is a scene graph, that is similar to Flash one. To be short, You can call this as Flash for C++, but more comfortable and way faster. Initially it was developed for mobile platforms (iOS, Android), but can be also used for PC games.
@@ -14,6 +14,13 @@ Source code is available under MIT license (use for free anywhere).
 - Examples
 - Demo for testing and demonstration of base features
 
+##Supported platforms:
+- Android
+- iOS
+- Windows
+- MacOSX
+- Emscripten (web)
+
 
 ##Examples of code:
 
@@ -42,15 +49,15 @@ Source code is available under MIT license (use for free anywhere).
 		      arg_attachTo = getRoot());
 
 ##Features:
-- Language C++.
-- For rendering 2.0 is used. Custom shaders supported.
+- Programming language is C++.
+- For rendering OpenGL(ES) 2.0 is used. Custom shaders supported.
 - Compressed textures supported.
 - Component based system, simple and predictable OOP API. Possibility to inherit from classes and overload their behavior.
 - No global mega managers of everything, that dictates requirements to the way you write your code.
 - Effective and flexible work with resources, very close to your game.
 - Components of the engine have weak links between each other. Can be used together, separately or not at all.
 - Fast creation and deletion of objects using memory pools for all engine objects.
-- SceneGraph is built on smart pointers (analogue boost:intrusive_ptr). No need to hassle with memory control, memory leaks, but sometimes you need to fix loop references(by not doing them). It is somewhat similar to Flash ([diagrams with inheritance models](https://dl.dropbox.com/u/12679384/oxygine/actor_inheritance.png)). If you want to use your own scene graph you can use just low level images rendering system from Oxygine.
+- SceneGraph is somewhat similar to Flash ([diagrams with inheritance models](https://dl.dropbox.com/u/12679384/oxygine/actor_inheritance.png)). It is built on smart pointers (analogue boost:intrusive_ptr). No need to hassle with memory control, memory leaks. If you want to use your own scene graph you can use just low level images rendering system from Oxygine.
 - Debug Tools ([screenshot](https://dl.dropboxusercontent.com/u/12679384/oxygine/debug_tools.gif)). Tree Inspector is “Visual profiler” for Scene Graph. Right in the game you can view the graph and different branches to analyze and errors search. “Textures Inspector” shows you currently loaded textures into memory.
 “Textures Inspector” shows you currently loaded textures into memory ([screenshot](https://dl.dropbox.com/u/12679384/oxygine/textures_inspector.png))
 - Render to texture.
@@ -64,13 +71,13 @@ For different event handlers(or tweens) you can setup callbacks based on Winnie.
 - Accurate rendering of text with line wraps, vertical and horizontal alignment support, localization, utf-8. Base HTML tags support ([screenshot](https://dl.dropboxusercontent.com/u/12679384/oxygine/text_align.gif)).
 - If you want to add multiple sets of assets for different game resolutions it can be done on the engine level by writing just a few lines of code. You won’t need to adjust coordinates manually for different resolution. It is enough just to keep initial art in high-res.
 - Masking ([screenshot](https://dl.dropboxusercontent.com/u/12679384/oxygine/masking.gif), [screenshot](https://dl.dropboxusercontent.com/u/12679384/oxygine/mask.png))
-- Atlas assembling on the fly during the loading, if you didn’t make it before.
+- Atlas assembling on the fly during the loading, if you didn't make it before.
 - Multi-threaded resources loading.
-- It is possible to partially unload from memory “heavy” resources, like atlases. The handler to work with atlas will be still valid (as well as his size) and will even have texture point, but the texture itself will be empty. This is very important when you have strict memory limitations : for example if you created all UI with all resources loaded, but there is no need to display them.
+- It is possible to partially unload from memory “heavy” resources, like atlases. The resouce handle to work with atlas will be still valid (as well as his size) and will even have texture point, but the texture itself will be empty. This is very important when you have strict memory limitations: for example if you created all UI with all resources loaded, but there is no need to display them.
 - Fast automatic batching.
 - Bitmap fonts based on [BMFont](http://www.angelcode.com/products/bmfont/). Possibility to add your own font type.
 
-You could build it on top of the Marmalade, SDL2 or adapt it for your platform. Oxygine could be build with Emscripten for internet browser too.
+You could build it on top of the Marmalade, SDL2 or adapt it for your platform. Oxygine could be build with Emscripten for internet browser as well.
 
 And this is not all. There are a lot of features, but it is easy to use them, framework is not a monster and very intuitively clear. Viewing of couple examples would be enough to understand how it works.
 

readme/CMake.txt

@@ -1,6 +1,8 @@
 1. start from readme.txt
 2. How to build and run Oxygine on Windows with CMake and Visual Studio (tested with VS2010 and VS2012). Steps:
 =================================================================================================
+- build SDL with CMake or by VisualStudio (see oxygine-framework/readme/VisualStudio.txt)
+
 - build SDL2. It could be done with cmake or prebuild VC++ solution. Find SDL2.lib, SDL2main.lib and SDL2.dll
 - copy SDL2.lib and SDL2main.lib to oxygine-framework/libs
 
@@ -9,16 +11,14 @@
 - run: cmake .
 - open generated solution. 
 - Select Demo project and set it "as startup project".
-- set working directory for Demo project to (right mouse click to Demo project->properties->ConfigurationProperties->Debugging->WorkingDirectory): 
-   ..\data
-- copy
-   all required dlls from  oxygine-framework\oxygine\third_party\win32\dlls\
-   and SDL2.dll 
-   to oxygine-framework\examples\Demo\data\
+- set working directory for Demo project to "..\data"
+	(right mouse click on Demo -> project->properties->ConfigurationProperties->Debugging->WorkingDirectory)
+- copy all dlls from  oxygine-framework\oxygine\third_party\win32\dlls\
+   and SDL2.dll from oxygine-framework/libs 
+   to  oxygine-framework\examples\Demo\data\   
    
 - ready! run!
-=================================================================================================
-(for windows: cmake -DDIRECTX=0)
+
 
 3. How to build and run Oxygine on Linux with CMake
 =================================================================================================
@@ -35,3 +35,13 @@ make and install SDL2
   - copy all files from example/Demo/data to examples/Demo/proj.cmake
   - run ./Demo   
 =================================================================================================
+
+4. You could generate your own CMake configuration
+- you need installed Python 2.7
+- you need to run this script
+  oxygine-framework\tools\gen_template.py
+
+example:
+	python gen_template.py MyProject -t cmake -d path/to/MyProject/
+	
+

readme/VisualStudio.txt

@@ -2,21 +2,24 @@
 
 2a. There are prebuilt example solutions for VS2010 and VS2013:
 =================================================================================================
+- build SDL:
+  - open SDL\include\SDL_config_windows.h in any text editor
+  - find this line:
+    #define SDL_AUDIO_DRIVER_XAUDIO2    1
+  - and comment it:
+    //#define SDL_AUDIO_DRIVER_XAUDIO2    1
+  - goto folder SDL\VisualC\ 
+  - open SDL_VS2010.sln (or any other) and build it as Release
+  - goto golder SDL\VisualC\Win32\Release\
+  - and copy SDL2.lib, SDL2main.lib and SDL2.dll to oxygine-framework/libs
+
 - goto oxygine-framework\examples and choose any example. Lets call it "Demo" 
 - open solution located in oxygine-framework\examples\Demo\proj.win32\
-- if you don't have directx sdk installed then go to SDL and find file: SDL_config_windows.h
-- then find this line:
-	#define SDL_AUDIO_DRIVER_XAUDIO2    1
-- and comment it:
-	//#define SDL_AUDIO_DRIVER_XAUDIO2    1
 - try to build Demo
-- copy
-   all required dlls from  oxygine-framework\oxygine\third_party\win32\dlls\
-   and SDL2.dll from 
-   oxygine-framework\examples\Demo\proj.win32\Win32\ <Debug> or <Release>
-   (SDL\VisualC\SDL\Win32\   <Debug> or <Release>)
+- copy all dlls from  oxygine-framework\oxygine\third_party\win32\dlls\
+   and SDL2.dll from oxygine-framework/libs 
    to  oxygine-framework\examples\Demo\data\   
-- working directory of Demo project should point to "data" folder (right click on Demo -> Config.Properties->Debugging->set working dir)
+- working directory of Demo project should point to "../data" folder (right mouse click on Demo -> project->properties->ConfigurationProperties->Debugging->WorkingDirectory)
 - ready! run!
 =================================================================================================
 

tools/gen_template.py

@@ -275,7 +275,7 @@ def run(args):
                     dest_file = io.open(dest_path, "w", newline="\n")
                     dest_file.write(unicode(dest_data, encoding='utf-8')) 
                 else:
-                    dest_file = io.open(dest_path, "w")
+                    dest_file = open(dest_path, "w")
                     dest_file.write(dest_data)      
                 
             else:

tools/others/build_marmalade_lib.py

@@ -1,106 +0,0 @@
-import os
-import shutil
-import glob
-import subprocess
-
-print "building oxygine"
-marmalade = os.environ["S3E_DIR"]
-
-os.chdir("../")
-
-RESULT = "oxygine.zip"
-
-print "cleaning temp..."
-shutil.rmtree("temp", True)
-
-if os.path.exists(RESULT):
-    shutil.move(RESULT, "_" + RESULT)
-
-
-print "hg archive..."
-os.system("hg archive temp/oxygine")
-
-os.chdir("temp\\oxygine")
-
-mkb = "oxygine\\marmalade\\oxygine_lib.mkb"
-cmd = "%(marmalade)s\\python\\python.exe %(marmalade)s\\makefile_builder\\mkb.py --make " % {"marmalade" : marmalade, };
-
-cm = "%(cmd)s --arm --compiler=gcc --no-ide %(mkb)s" % {"cmd":cmd, "mkb":mkb}
-os.system(cm)
-cm = "%(cmd)s --x86 --no-ide %(mkb)s" % {"cmd":cmd, "mkb":mkb}
-os.system(cm)
-
-os.system("doxygen")
-
-
-def rec_del(path):
-    for each in os.listdir(path):
-        new_path = os.path.join(path, each)
-        
-        if not os.path.isfile(new_path):
-            rec_del(new_path)
-        else:
-            os.remove(new_path)
-    os.rmdir(path)
-
-
-def processFolder(folder_path):
-    folder_path += "//"
-    try:
-        oxbuild_path = folder_path + ".oxbuild"
-        oxbuild = open(oxbuild_path)
-        for line in oxbuild.readlines():
-            line = line.rstrip()
-            item2delete = folder_path + line
-            
-            filelist = glob.glob(item2delete)
-            for file in filelist:
-                #print file
-                if os.path.isfile(file):
-                    os.remove(file)
-                else:
-                    rec_del(file)
-                
-            #print delit
-            
-        oxbuild.close()
-        os.remove(oxbuild_path)
-    except IOError:
-        pass
-        
-    for each in os.listdir(folder_path):
-        full_path = os.path.join(folder_path, each)  
-        if not os.path.isfile(full_path):
-            #print full_path
-            processFolder(full_path)
-            
-        #print full_path
-
-
-processFolder(".")
-
-
-
-def recursive_zip(zipf, directory, folder = ""):
-    for item in os.listdir(directory):
-        if os.path.isfile(os.path.join(directory, item)):
-            zipf.write(os.path.join(directory, item), folder + os.sep + item)
-        elif os.path.isdir(os.path.join(directory, item)):
-            recursive_zip(zipf, os.path.join(directory, item), folder + os.sep + item)
-            
-os.chdir("..\\..\\")
-            
-print "zipping..."
-import zipfile
-
-zp = zipfile.ZipFile("temp/oxygine/doc.zip", "w", compression = zipfile.ZIP_DEFLATED)
-recursive_zip(zp, "temp/oxygine/doc")
-zp.close()
-shutil.rmtree("temp/oxygine/doc")
-
-zipf = zipfile.ZipFile(RESULT, "w", compression = zipfile.ZIP_DEFLATED)
-path = "temp"
-recursive_zip(zipf, path)
-zipf.close()
-
-print "done."

tools/others/build_oxygine_with_sdl.py

@@ -0,0 +1,83 @@
+import os
+import sys
+import shutil
+import zipfile
+
+temp = "../../temp"
+SDL_dest = temp + "/SDL"
+OXYGINE_dest = temp + "/oxygine-framework/"
+
+print "cleaning temp..."
+shutil.rmtree(temp, True)
+
+print "hg archive..."
+cmd = "hg archive " + OXYGINE_dest
+os.system(cmd)
+
+cmd = "hg archive -R ../../../SDL %s" % (SDL_dest, )
+os.system(cmd)
+
+shutil.rmtree(SDL_dest + "/test")
+
+def fix_file(name, cb):
+    data = open(name, "rb").read()    
+    data = cb(data)
+    open(name, "wb").write(data)
+    
+
+
+fix_file(SDL_dest + "/include/SDL_config_windows.h", 
+         lambda data: data.replace("#define SDL_AUDIO_DRIVER_XAUDIO2", "//#define SDL_AUDIO_DRIVER_XAUDIO2")
+         )
+
+fix_file(SDL_dest + "/src/video/uikit/SDL_uikitview.h", 
+         lambda data: data.replace("#define IPHONE_TOUCH_EFFICIENT_DANGEROUS", "//#define IPHONE_TOUCH_EFFICIENT_DANGEROUS")
+         )
+
+def enum(folder, cb):
+    for item in os.listdir(folder):        
+        path = folder + item 
+        if os.path.isdir(path):
+            if item == "data":
+                print path
+                cb(path)
+            enum(path + "/", cb)
+            
+def copy(path):
+    win32 = OXYGINE_dest + "/oxygine/third_party/win32/dlls/"
+    items = (win32 + "zlib1.dll", 
+             win32 + "pthreadVCE2.dll",
+             "../../libs/SDL2.dll")
+    for item in items:
+        name = os.path.split(item)[1]
+        shutil.copy(item, path + "/" + name)
+        
+    
+        
+enum(OXYGINE_dest + "/examples/", copy)
+
+shutil.copy(SDL_dest + "/android-project/src/org/libsdl/app/SDLActivity.java", 
+            OXYGINE_dest + "/oxygine/SDL/android/lib/src/org/libsdl/app/SDLActivity.java")
+
+libs = ("SDL2.lib", "SDL2main.lib")
+for lib in libs:
+    shutil.copy("../../libs/" + lib, OXYGINE_dest + "/libs/" + lib)
+
+os.chdir(OXYGINE_dest)
+
+
+
+def recursive_zip(zipf, directory, folder = ""):
+    for item in os.listdir(directory):
+        if os.path.isfile(os.path.join(directory, item)):
+            zipf.write(os.path.join(directory, item), folder + os.sep + item)
+        elif os.path.isdir(os.path.join(directory, item)):
+            recursive_zip(zipf, os.path.join(directory, item), folder + os.sep + item)
+
+destzip = "../../oxygine-framework.zip"
+with zipfile.ZipFile(destzip, "w", compression = zipfile.ZIP_DEFLATED) as zp:
+    recursive_zip(zp, "../")
+    
+shutil.copyfile(destzip, "../../../gdrive/oxygine/oxygine-framework-with-sdl.zip")
+
+print "done."

tools/others/build_oxygine_zip.py

@@ -12,8 +12,6 @@ print "hg archive..."
 os.system("hg archive " + dest)
 os.chdir(dest)
 
-os.system("doxygen " + dest + "Doxyfile")
-
 def recursive_zip(zipf, directory, folder = ""):
     for item in os.listdir(directory):
         if os.path.isfile(os.path.join(directory, item)):
@@ -22,10 +20,6 @@ def recursive_zip(zipf, directory, folder = ""):
             recursive_zip(zipf, os.path.join(directory, item), folder + os.sep + item)
 
 
-with zipfile.ZipFile("doc.zip", "w", compression = zipfile.ZIP_DEFLATED) as zp:
-    recursive_zip(zp, "doc")
-    shutil.rmtree("doc")
-
 destzip = "../../oxygine-framework.zip"
 with zipfile.ZipFile(destzip, "w", compression = zipfile.ZIP_DEFLATED) as zp:
     recursive_zip(zp, "../")

tools/others/gen_templates.py

@@ -4,7 +4,7 @@ def gen(path, project = ""):
 		project = path
 
 	projs = ("win32", "android", "macosx", "ios", "cmake", "emscripten")
-	projs = ("ios", "macosx")
+	#projs = ("ios", "macosx")
 
 	for platform in projs:
 		dest = "../../examples/" + path + "/proj." + platform

tools/templates/proj.win32/${PROJECT}_vs2010.sln

@@ -3,10 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${PROJECT}_vs2010", "${PROJECT}_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "${ROOT}\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "${ROOT}\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "${OXYGINE}\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

tools/templates/proj.win32/${PROJECT}_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>${OXYGINE}/oxygine/third_party/win32/libraries;${OXYGINE}/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,16 +77,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>${OXYGINE}/oxygine/third_party/win32/libraries;${OXYGINE}/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="${ROOT}\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="${ROOT}\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="${OXYGINE}\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>

tools/templates/proj.win32/${PROJECT}_vs2013.sln

@@ -4,10 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.21005.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "${PROJECT}_vs2013", "${PROJECT}_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "${ROOT}\SDL\VisualC\SDL\SDL_VS2013.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "${ROOT}\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "${OXYGINE}\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global

tools/templates/proj.win32/${PROJECT}_vs2013.vcxproj

@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>${OXYGINE}/oxygine/third_party/win32/libraries;${OXYGINE}/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -79,16 +79,10 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>${OXYGINE}/oxygine/third_party/win32/libraries;${OXYGINE}/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="${ROOT}\SDL\VisualC\SDLmain\SDLmain_VS2013.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="${ROOT}\SDL\VisualC\SDL\SDL_VS2013.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
+  <ItemGroup>    
     <ProjectReference Include="${OXYGINE}\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>