update

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: a35e9abd419682e02adde7ffb9bd3fa9e79b53fa
+node: f12360f89c960f4c9c93dac9e8efe4b66fa5973b
 branch: default
 latesttag: oldrender
-latesttagdistance: 70
+latesttagdistance: 71

examples/Demo/win32/HelloWorld_vs2010.vcxproj

@@ -56,7 +56,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;SDL2.lib;SDL2main.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>../../../oxygine/third_party/win32/libraries;../../../libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -77,7 +77,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>../../../oxygine/third_party/win32/libraries;../../../libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;SDL2.lib;SDL2main.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

readme.CMake

@@ -3,19 +3,22 @@
 
 2. How to build and run Oxygine on Windows with CMake and Visual Studio (tested with VS2010 and VS2012). Steps:
 =================================================================================================
-- build SDL2
+- 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
 
 - goto examples
 - create folder "build"
-- generate solution with cmake (from oxygine-framework/examples/build folder):
+- generate solution for VS with cmake (from oxygine-framework/examples/build folder):
   cmake ..
-- open solution. select any project for example Demo and set it "as startup project"
+- open generated solution. 
+- select any example from solution. I chose Demo and set it "as startup project".
 - set working directory for Demo project to: 
    oxygine-framework\examples\Demo\data\
-- copy all required dlls to this folder
-   oxygine-framework\examples\Demo\data\
-   it is SDL2.dll and dlls from  oxygine-framework\oxygine\third_party\win32\libraries\
+- copy
+   all required dlls from  oxygine-framework\oxygine\third_party\win32\dlls\
+   and SDL2.dll 
+   to oxygine-framework\examples\Demo\data\
+   
 - ready! run!
 =================================================================================================
 

readme.VisualStudio

@@ -1,19 +1,14 @@
 1. read readme.SDL2
 
-
 2. There is prebuilt solution for VS2010 with Demo example:
 =================================================================================================
 - open solution from oxygine-framework\examples\Demo\win32\
-- select project Demo and set it "as startup project"
-- set working directory for Demo project to: 
-   oxygine-framework\examples\Demo\data\
-- copy all required dlls to this folder
-   oxygine-framework\examples\Demo\data\
-   it is SDL2.dll and dlls from  oxygine-framework\oxygine\third_party\win32\libraries\
-- if you don't have directx sdk installed then find open SDL_config_windows.h and comment it:
-//#define SDL_AUDIO_DRIVER_XAUDIO2    1
+- if you don't have directx sdk installed then find open SDL_config_windows.h and comment this line:
+    //#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 SDL\VisualC\SDL\Win32\   <Debug> or <Release>
+   to 	 oxygine-framework\examples\Demo\data\   
 - ready! run!
-=================================================================================================
-
-
-
+=================================================================================================