Browse Source

Merge branch 'master' of https://github.com/otraore/oxygine-framework into dev

dmuratshin 9 years ago
parent
commit
1511de9def
70 changed files with 140 additions and 140 deletions
  1. 1 0
      .gitignore
  2. 1 1
      examples/Demo/proj.android/jni/src/Android.mk
  3. 1 1
      examples/Demo/proj.cmake/CMakeLists.txt
  4. 1 1
      examples/Demo/proj.emscripten/CMakeLists.txt
  5. 4 4
      examples/Demo/proj.ios/demo_ios.xcodeproj/project.pbxproj
  6. 4 4
      examples/Demo/proj.macosx/demo_macosx.xcodeproj/project.pbxproj
  7. 1 1
      examples/Demo/proj.win32/Demo.vcxproj
  8. 1 1
      examples/Demo/proj.win32/Demo.vcxproj.filters
  9. 0 0
      examples/Demo/src/main.cpp
  10. 1 1
      examples/DemoBox2D/proj.android/jni/src/Android.mk
  11. 1 1
      examples/DemoBox2D/proj.cmake/CMakeLists.txt
  12. 1 1
      examples/DemoBox2D/proj.emscripten/CMakeLists.txt
  13. 4 4
      examples/DemoBox2D/proj.ios/DemoBox2D_ios.xcodeproj/project.pbxproj
  14. 4 4
      examples/DemoBox2D/proj.macosx/DemoBox2D_macosx.xcodeproj/project.pbxproj
  15. 1 1
      examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj
  16. 1 1
      examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj.filters
  17. 0 0
      examples/DemoBox2D/src/main.cpp
  18. 1 1
      examples/Game/part1/proj.android/jni/src/Android.mk
  19. 1 1
      examples/Game/part1/proj.cmake/CMakeLists.txt
  20. 1 1
      examples/Game/part1/proj.emscripten/CMakeLists.txt
  21. 4 4
      examples/Game/part1/proj.ios/GamePart1_ios.xcodeproj/project.pbxproj
  22. 4 4
      examples/Game/part1/proj.macosx/GamePart1_macosx.xcodeproj/project.pbxproj
  23. 1 1
      examples/Game/part1/proj.win32/GamePart1.vcxproj
  24. 0 0
      examples/Game/part1/src/main.cpp
  25. 1 1
      examples/Game/part2/proj.android/jni/src/Android.mk
  26. 1 1
      examples/Game/part2/proj.cmake/CMakeLists.txt
  27. 1 1
      examples/Game/part2/proj.emscripten/CMakeLists.txt
  28. 4 4
      examples/Game/part2/proj.ios/GamePart2_ios.xcodeproj/project.pbxproj
  29. 4 4
      examples/Game/part2/proj.macosx/GamePart2_macosx.xcodeproj/project.pbxproj
  30. 1 1
      examples/Game/part2/proj.win32/GamePart2.vcxproj
  31. 0 0
      examples/Game/part2/src/main.cpp
  32. 1 1
      examples/Game/part3/proj.android/jni/src/Android.mk
  33. 1 1
      examples/Game/part3/proj.cmake/CMakeLists.txt
  34. 1 1
      examples/Game/part3/proj.emscripten/CMakeLists.txt
  35. 4 4
      examples/Game/part3/proj.ios/GamePart3_ios.xcodeproj/project.pbxproj
  36. 4 4
      examples/Game/part3/proj.macosx/GamePart3_macosx.xcodeproj/project.pbxproj
  37. 1 1
      examples/Game/part3/proj.win32/GamePart3.vcxproj
  38. 0 0
      examples/Game/part3/src/main.cpp
  39. 1 1
      examples/Game/part4/proj.android/jni/src/Android.mk
  40. 1 1
      examples/Game/part4/proj.cmake/CMakeLists.txt
  41. 1 1
      examples/Game/part4/proj.emscripten/CMakeLists.txt
  42. 4 4
      examples/Game/part4/proj.ios/GamePart4_ios.xcodeproj/project.pbxproj
  43. 4 4
      examples/Game/part4/proj.macosx/GamePart4_macosx.xcodeproj/project.pbxproj
  44. 1 1
      examples/Game/part4/proj.win32/GamePart4.vcxproj
  45. 0 0
      examples/Game/part4/src/main.cpp
  46. 1 1
      examples/Game/part5/proj.android/jni/src/Android.mk
  47. 1 1
      examples/Game/part5/proj.cmake/CMakeLists.txt
  48. 1 1
      examples/Game/part5/proj.emscripten/CMakeLists.txt
  49. 4 4
      examples/Game/part5/proj.ios/GamePart5_ios.xcodeproj/project.pbxproj
  50. 4 4
      examples/Game/part5/proj.macosx/GamePart5_macosx.xcodeproj/project.pbxproj
  51. 1 1
      examples/Game/part5/proj.win32/GamePart5.vcxproj
  52. 0 0
      examples/Game/part5/src/main.cpp
  53. 1 1
      examples/HelloWorld/proj.android/jni/src/Android.mk
  54. 1 1
      examples/HelloWorld/proj.cmake/CMakeLists.txt
  55. 1 1
      examples/HelloWorld/proj.emscripten/CMakeLists.txt
  56. 4 4
      examples/HelloWorld/proj.ios/HelloWorld_ios.xcodeproj/project.pbxproj
  57. 4 4
      examples/HelloWorld/proj.macosx/HelloWorld_macosx.xcodeproj/project.pbxproj
  58. 1 1
      examples/HelloWorld/proj.win32/HelloWorld.vcxproj
  59. 3 3
      examples/HelloWorld/src/example.cpp
  60. 0 0
      examples/HelloWorld/src/main.cpp
  61. 1 1
      examples/Match3/proj.android/jni/src/Android.mk
  62. 1 1
      examples/Match3/proj.cmake/CMakeLists.txt
  63. 1 1
      examples/Match3/proj.emscripten/CMakeLists.txt
  64. 4 4
      examples/Match3/proj.ios/Match3_ios.xcodeproj/project.pbxproj
  65. 4 4
      examples/Match3/proj.macosx/Match3_macosx.xcodeproj/project.pbxproj
  66. 1 1
      examples/Match3/proj.win32/Match3.vcxproj
  67. 0 0
      examples/Match3/src/main.cpp
  68. 9 10
      tools/gen_template.py
  69. 1 1
      tools/others/update_examples_entry.py
  70. 16 16
      tools/oxyresbuild.py

+ 1 - 0
.gitignore

@@ -58,3 +58,4 @@ oxygine/SDL/android/extension/bin/
 build
 /examples/Demo/proj.cmake/mingw
 **/proj.marmalade/build_demo_vc*
+.DS_Store

+ 1 - 1
examples/Demo/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Counter.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/test.cpp 
+LOCAL_SRC_FILES += ../../../src/Counter.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/test.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Demo/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(Demo ../src/Counter.cpp ../src/entry_point.cpp ../src/example.cpp ../src/test.cpp 
+add_executable(Demo ../src/Counter.cpp ../src/main.cpp ../src/example.cpp ../src/test.cpp
 	../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h
 	../src/TestColorFont.h ../src/TestTweenGlow.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/TestTweenAlphaFade.h ../src/example.h ../src/test.h )
 

+ 1 - 1
examples/Demo/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(Demo ../src/Counter.cpp ../src/entry_point.cpp ../src/example.cpp ../src/test.cpp  ../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h ../src/TestColorFont.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTouches.h ../src/TestTweenShine.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/example.h ../src/test.h )
+add_executable(Demo ../src/Counter.cpp ../src/main.cpp ../src/example.cpp ../src/test.cpp  ../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h ../src/TestColorFont.h ../src/TestCounter.h ../src/TestDrag.h ../src/TestHttp.h ../src/TestInputText.h ../src/TestManageRes.h ../src/TestMask.h ../src/TestPerf.h ../src/TestPolygon.h ../src/TestProgressBar.h ../src/TestRender2Texture.h ../src/TestSliding.h ../src/TestTexel2Pixel.h ../src/TestText.h ../src/TestTextureFormat.h ../src/TestTouches.h ../src/TestTweenShine.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/example.h ../src/test.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Demo/proj.ios/demo_ios.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@
 		922B9F8F1BBB2FB100B1401E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 922B9F8E1BBB2FB100B1401E /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
 
 		2DC477AC10D6C07B3FE008F6 /* ../src/Counter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/Counter.cpp */; };
-		DA49ED8903C628BA578C8670 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */; };
+		DA49ED8903C628BA578C8670 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/main.cpp */; };
 		C8860D93875589970329DCCD /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/example.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/test.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../data/demo in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/demo */; };
@@ -89,7 +89,7 @@
 		922B9F8F1BBB2FB100B1401E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 922B9F8E1BBB2FB100B1401E /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
 
 		360377333740D8A2FD15BBE6 /* ../src/Counter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Counter.cpp; path = ../src/Counter.cpp; sourceTree = "<group>"; };
-		0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		0BF9628FC8D38F9748F0CDEB /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../src/test.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Counter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Counter.h; path = ../src/Counter.h; sourceTree = "<group>"; };
@@ -229,7 +229,7 @@
 			isa = PBXGroup;
 			children = (
 				360377333740D8A2FD15BBE6 /* Counter.cpp */, 
-				0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */, 
+				0BF9628FC8D38F9748F0CDEB /* main.cpp */,
 				4DA100C319512824B7570663 /* example.cpp */, 
 				04FE4D4FB640E0DF92DFB865 /* test.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Counter.h */, 
@@ -373,7 +373,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2DC477AC10D6C07B3FE008F6 /* Counter.cpp */, 
-				DA49ED8903C628BA578C8670 /* entry_point.cpp */, 
+				DA49ED8903C628BA578C8670 /* main.cpp */,
 				C8860D93875589970329DCCD /* example.cpp */, 
 				1E839D002B2BA83FC83A695A /* test.cpp */, 
 

+ 4 - 4
examples/Demo/proj.macosx/demo_macosx.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		049B57321871FBE900EF3C66 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 049B57311871FBE900EF3C66 /* Cocoa.framework */; };
 		049B574A1871FBE900EF3C66 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 049B57491871FBE900EF3C66 /* Images.xcassets */; };
 		2DC477AC10D6C07B3FE008F6 /* ../src/Counter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/Counter.cpp */; };
-		DA49ED8903C628BA578C8670 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */; };
+		DA49ED8903C628BA578C8670 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/main.cpp */; };
 		C8860D93875589970329DCCD /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/example.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/test.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../data/demo in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/demo */; };
@@ -97,7 +97,7 @@
 		049B57491871FBE900EF3C66 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Demo/Images.xcassets; sourceTree = "<group>"; };
 		049B57501871FBE900EF3C66 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		360377333740D8A2FD15BBE6 /* ../src/Counter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Counter.cpp; path = ../src/Counter.cpp; sourceTree = "<group>"; };
-		0BF9628FC8D38F9748F0CDEB /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		0BF9628FC8D38F9748F0CDEB /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../src/test.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Counter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Counter.h; path = ../src/Counter.h; sourceTree = "<group>"; };
@@ -234,7 +234,7 @@
 			isa = PBXGroup;
 			children = (
 				360377333740D8A2FD15BBE6 /* Counter.cpp */, 
-				0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */, 
+				0BF9628FC8D38F9748F0CDEB /* main.cpp */,
 				4DA100C319512824B7570663 /* example.cpp */, 
 				04FE4D4FB640E0DF92DFB865 /* test.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Counter.h */, 
@@ -398,7 +398,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				2DC477AC10D6C07B3FE008F6 /* Counter.cpp */, 
-				DA49ED8903C628BA578C8670 /* entry_point.cpp */, 
+				DA49ED8903C628BA578C8670 /* main.cpp */,
 				C8860D93875589970329DCCD /* example.cpp */, 
 				1E839D002B2BA83FC83A695A /* test.cpp */, 
 

+ 1 - 1
examples/Demo/proj.win32/Demo.vcxproj

@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../src/Counter.cpp" />
-    <ClCompile Include="../src/entry_point.cpp" />
+    <ClCompile Include="../src/main.cpp" />
     <ClCompile Include="../src/example.cpp" />
     <ClCompile Include="../src/test.cpp" />
   </ItemGroup>

+ 1 - 1
examples/Demo/proj.win32/Demo.vcxproj.filters

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="../src/Counter.cpp" />
-    <ClCompile Include="../src/entry_point.cpp" />
+    <ClCompile Include="../src/main.cpp" />
     <ClCompile Include="../src/example.cpp" />
     <ClCompile Include="../src/test.cpp" />
   </ItemGroup>

+ 0 - 0
examples/Demo/src/entry_point.cpp → examples/Demo/src/main.cpp


+ 1 - 1
examples/DemoBox2D/proj.android/jni/src/Android.mk

@@ -29,7 +29,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Box2DDebugDraw.cpp ../../../src/entry_point.cpp ../../../src/example.cpp 
+LOCAL_SRC_FILES += ../../../src/Box2DDebugDraw.cpp ../../../src/main.cpp ../../../src/example.cpp
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static box2d_static
 LOCAL_SHARED_LIBRARIES := SDL2

+ 1 - 1
examples/DemoBox2D/proj.cmake/CMakeLists.txt

@@ -12,7 +12,7 @@ file(GLOB_RECURSE BOX2DSRC
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/entry_point.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
+add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/main.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
 source_group(box2d FILES ${BOX2DSRC})
 include_directories(../box2d)
 

+ 1 - 1
examples/DemoBox2D/proj.emscripten/CMakeLists.txt

@@ -15,7 +15,7 @@ file(GLOB_RECURSE BOX2DSRC
 
 include_directories(../box2d)
 
-add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/entry_point.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
+add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/main.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
 
 
 

+ 4 - 4
examples/DemoBox2D/proj.ios/DemoBox2D_ios.xcodeproj/project.pbxproj

@@ -73,7 +73,7 @@
 		9271CF3D1BAB66B50085E667 /* b2Rope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9271CF0E1BAB66B50085E667 /* b2Rope.cpp */; };
 		C8860D93875589970329DCCD /* example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* example.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* res.xml in Resources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* res.xml */; };
-		DA49ED8903C628BA578C8670 /* entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */; };
+		DA49ED8903C628BA578C8670 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* main.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -124,7 +124,7 @@
 		04998EF617F8B6F3003441C3 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = "../../..//oxygine/third_party/ios/libraries/libjpeg.a"; sourceTree = "<group>"; };
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = DemoBox2D/Images.xcassets; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
-		0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		0BF9628FC8D38F9748F0CDEB /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* Box2DDebugDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Box2DDebugDraw.cpp; path = ../src/Box2DDebugDraw.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		5DE458993031811A4C7D28C1 /* Box2DDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Box2DDebugDraw.h; path = ../src/Box2DDebugDraw.h; sourceTree = "<group>"; };
@@ -323,7 +323,7 @@
 			children = (
 				92908EE119C9EBE00088BCA9 /* box2d */,
 				360377333740D8A2FD15BBE6 /* Box2DDebugDraw.cpp */,
-				0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */,
+				0BF9628FC8D38F9748F0CDEB /* main.cpp */,
 				4DA100C319512824B7570663 /* example.cpp */,
 				5DE458993031811A4C7D28C1 /* Box2DDebugDraw.h */,
 				BA41FC88D76540A6905224D6 /* example.h */,
@@ -621,7 +621,7 @@
 				9271CF2D1BAB66B50085E667 /* b2EdgeAndCircleContact.cpp in Sources */,
 				9271CF1C1BAB66B50085E667 /* b2BlockAllocator.cpp in Sources */,
 				9271CF1D1BAB66B50085E667 /* b2Draw.cpp in Sources */,
-				DA49ED8903C628BA578C8670 /* entry_point.cpp in Sources */,
+				DA49ED8903C628BA578C8670 /* main.cpp in Sources */,
 				9271CF3B1BAB66B50085E667 /* b2WeldJoint.cpp in Sources */,
 				9271CF1B1BAB66B50085E667 /* b2PolygonShape.cpp in Sources */,
 				9271CF291BAB66B50085E667 /* b2ChainAndPolygonContact.cpp in Sources */,

+ 4 - 4
examples/DemoBox2D/proj.macosx/DemoBox2D_macosx.xcodeproj/project.pbxproj

@@ -66,7 +66,7 @@
 		9271CEA71BAB66780085E667 /* b2Rope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9271CE781BAB66780085E667 /* b2Rope.cpp */; };
 		C8860D93875589970329DCCD /* example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* example.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* res.xml in Resources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* res.xml */; };
-		DA49ED8903C628BA578C8670 /* entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */; };
+		DA49ED8903C628BA578C8670 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* main.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -139,7 +139,7 @@
 		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = "../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj"; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
-		0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		0BF9628FC8D38F9748F0CDEB /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		360377333740D8A2FD15BBE6 /* Box2DDebugDraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Box2DDebugDraw.cpp; path = ../src/Box2DDebugDraw.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		5DE458993031811A4C7D28C1 /* Box2DDebugDraw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Box2DDebugDraw.h; path = ../src/Box2DDebugDraw.h; sourceTree = "<group>"; };
@@ -330,7 +330,7 @@
 			children = (
 				92908F7419C9ECAC0088BCA9 /* box2d */,
 				360377333740D8A2FD15BBE6 /* Box2DDebugDraw.cpp */,
-				0BF9628FC8D38F9748F0CDEB /* entry_point.cpp */,
+				0BF9628FC8D38F9748F0CDEB /* main.cpp */,
 				4DA100C319512824B7570663 /* example.cpp */,
 				5DE458993031811A4C7D28C1 /* Box2DDebugDraw.h */,
 				BA41FC88D76540A6905224D6 /* example.h */,
@@ -647,7 +647,7 @@
 				9271CE971BAB66780085E667 /* b2EdgeAndCircleContact.cpp in Sources */,
 				9271CE861BAB66780085E667 /* b2BlockAllocator.cpp in Sources */,
 				9271CE871BAB66780085E667 /* b2Draw.cpp in Sources */,
-				DA49ED8903C628BA578C8670 /* entry_point.cpp in Sources */,
+				DA49ED8903C628BA578C8670 /* main.cpp in Sources */,
 				9271CEA51BAB66780085E667 /* b2WeldJoint.cpp in Sources */,
 				9271CE851BAB66780085E667 /* b2PolygonShape.cpp in Sources */,
 				9271CE931BAB66780085E667 /* b2ChainAndPolygonContact.cpp in Sources */,

+ 1 - 1
examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj

@@ -115,7 +115,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../src/Box2DDebugDraw.cpp" />
-    <ClCompile Include="../src/entry_point.cpp" />
+    <ClCompile Include="../src/main.cpp" />
     <ClCompile Include="../src/example.cpp" />
     <ClCompile Include="..\box2d\Box2D\Collision\b2BroadPhase.cpp" />
     <ClCompile Include="..\box2d\Box2D\Collision\b2CollideCircle.cpp" />

+ 1 - 1
examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj.filters

@@ -18,7 +18,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/entry_point.cpp">
+    <ClCompile Include="../src/main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="../src/example.cpp">

+ 0 - 0
examples/DemoBox2D/src/entry_point.cpp → examples/DemoBox2D/src/main.cpp


+ 1 - 1
examples/Game/part1/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Game.cpp ../../../src/Joystick.cpp ../../../src/Player.cpp ../../../src/Unit.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/res.cpp 
+LOCAL_SRC_FILES += ../../../src/Game.cpp ../../../src/Joystick.cpp ../../../src/Player.cpp ../../../src/Unit.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/res.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Game/part1/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart1 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Game/part1/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Game/part1/proj.ios/GamePart1_ios.xcodeproj/project.pbxproj

@@ -29,7 +29,7 @@
 		DA49ED8903C628BA578C8670 /* ../src/Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/Joystick.cpp */; };
 		C8860D93875589970329DCCD /* ../src/Player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/Player.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/Unit.cpp */; };
-		3A631A475DE035FC53ADE5EA /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/entry_point.cpp */; };
+		3A631A475DE035FC53ADE5EA /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/main.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../src/example.cpp */; };
 		EFF139F8BA484314F7AAF645 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/res.cpp */; };
 		F2CFD518E4E2E05ECEDBB262 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../data/images */; };
@@ -91,7 +91,7 @@
 		0BF9628FC8D38F9748F0CDEB /* ../src/Joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Joystick.cpp; path = ../src/Joystick.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Player.cpp; path = ../src/Player.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		7F3B12E3C9D554D9FE28101D /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		7F3B12E3C9D554D9FE28101D /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		5DE458993031811A4C7D28C1 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Game.h; path = ../src/Game.h; sourceTree = "<group>"; };
@@ -205,7 +205,7 @@
 				0BF9628FC8D38F9748F0CDEB /* Joystick.cpp */, 
 				4DA100C319512824B7570663 /* Player.cpp */, 
 				04FE4D4FB640E0DF92DFB865 /* Unit.cpp */, 
-				7F3B12E3C9D554D9FE28101D /* entry_point.cpp */, 
+				7F3B12E3C9D554D9FE28101D /* main.cpp */,
 				F6123B1E6FE4471A00F49751 /* example.cpp */, 
 				5DE458993031811A4C7D28C1 /* res.cpp */, 
 				F196143B0370A9D348494ACC /* Game.h */, 
@@ -327,7 +327,7 @@
 				DA49ED8903C628BA578C8670 /* Joystick.cpp */, 
 				C8860D93875589970329DCCD /* Player.cpp */, 
 				1E839D002B2BA83FC83A695A /* Unit.cpp */, 
-				3A631A475DE035FC53ADE5EA /* entry_point.cpp */, 
+				3A631A475DE035FC53ADE5EA /* main.cpp */,
 				CD59C69314E9E74CD0A11E03 /* example.cpp */, 
 				EFF139F8BA484314F7AAF645 /* res.cpp */, 
 

+ 4 - 4
examples/Game/part1/proj.macosx/GamePart1_macosx.xcodeproj/project.pbxproj

@@ -19,7 +19,7 @@
 		DA49ED8903C628BA578C8670 /* ../src/Joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/Joystick.cpp */; };
 		C8860D93875589970329DCCD /* ../src/Player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/Player.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/Unit.cpp */; };
-		3A631A475DE035FC53ADE5EA /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/entry_point.cpp */; };
+		3A631A475DE035FC53ADE5EA /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/main.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../src/example.cpp */; };
 		EFF139F8BA484314F7AAF645 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/res.cpp */; };
 		F2CFD518E4E2E05ECEDBB262 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../data/images */; };
@@ -99,7 +99,7 @@
 		0BF9628FC8D38F9748F0CDEB /* ../src/Joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Joystick.cpp; path = ../src/Joystick.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Player.cpp; path = ../src/Player.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		7F3B12E3C9D554D9FE28101D /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		7F3B12E3C9D554D9FE28101D /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		5DE458993031811A4C7D28C1 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Game.h; path = ../src/Game.h; sourceTree = "<group>"; };
@@ -213,7 +213,7 @@
 				0BF9628FC8D38F9748F0CDEB /* Joystick.cpp */, 
 				4DA100C319512824B7570663 /* Player.cpp */, 
 				04FE4D4FB640E0DF92DFB865 /* Unit.cpp */, 
-				7F3B12E3C9D554D9FE28101D /* entry_point.cpp */, 
+				7F3B12E3C9D554D9FE28101D /* main.cpp */,
 				F6123B1E6FE4471A00F49751 /* example.cpp */, 
 				5DE458993031811A4C7D28C1 /* res.cpp */, 
 				F196143B0370A9D348494ACC /* Game.h */, 
@@ -358,7 +358,7 @@
 				DA49ED8903C628BA578C8670 /* Joystick.cpp */, 
 				C8860D93875589970329DCCD /* Player.cpp */, 
 				1E839D002B2BA83FC83A695A /* Unit.cpp */, 
-				3A631A475DE035FC53ADE5EA /* entry_point.cpp */, 
+				3A631A475DE035FC53ADE5EA /* main.cpp */,
 				CD59C69314E9E74CD0A11E03 /* example.cpp */, 
 				EFF139F8BA484314F7AAF645 /* res.cpp */, 
 

+ 1 - 1
examples/Game/part1/proj.win32/GamePart1.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
+    <ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Game.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/Unit.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/res.h" />

+ 0 - 0
examples/Game/part1/src/entry_point.cpp → examples/Game/part1/src/main.cpp


+ 1 - 1
examples/Game/part2/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/Joystick.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Unit.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/res.cpp 
+LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/Joystick.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Unit.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/res.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Game/part2/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Rocket.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Rocket.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart2 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Game/part2/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Rocket.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Rocket.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Game/part2/proj.ios/GamePart2_ios.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@
 		1E839D002B2BA83FC83A695A /* ../src/Player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/Player.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/Rocket.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../src/Unit.cpp */; };
-		EFF139F8BA484314F7AAF645 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/entry_point.cpp */; };
+		EFF139F8BA484314F7AAF645 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/main.cpp */; };
 		F2CFD518E4E2E05ECEDBB262 /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../src/example.cpp */; };
 		693088A7AB377368EE4A018E /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/res.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../data/images */; };
@@ -95,7 +95,7 @@
 		04FE4D4FB640E0DF92DFB865 /* ../src/Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Player.cpp; path = ../src/Player.cpp; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BA41FC88D76540A6905224D6 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		D954BD82D7708B65A08FB6B9 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -213,7 +213,7 @@
 				04FE4D4FB640E0DF92DFB865 /* Player.cpp */, 
 				7F3B12E3C9D554D9FE28101D /* Rocket.cpp */, 
 				F6123B1E6FE4471A00F49751 /* Unit.cpp */, 
-				5DE458993031811A4C7D28C1 /* entry_point.cpp */, 
+				5DE458993031811A4C7D28C1 /* main.cpp */,
 				BA41FC88D76540A6905224D6 /* example.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* res.cpp */, 
 				D954BD82D7708B65A08FB6B9 /* Enemy.h */, 
@@ -339,7 +339,7 @@
 				1E839D002B2BA83FC83A695A /* Player.cpp */, 
 				3A631A475DE035FC53ADE5EA /* Rocket.cpp */, 
 				CD59C69314E9E74CD0A11E03 /* Unit.cpp */, 
-				EFF139F8BA484314F7AAF645 /* entry_point.cpp */, 
+				EFF139F8BA484314F7AAF645 /* main.cpp */,
 				F2CFD518E4E2E05ECEDBB262 /* example.cpp */, 
 				693088A7AB377368EE4A018E /* res.cpp */, 
 

+ 4 - 4
examples/Game/part2/proj.macosx/GamePart2_macosx.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@
 		1E839D002B2BA83FC83A695A /* ../src/Player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/Player.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/Rocket.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../src/Unit.cpp */; };
-		EFF139F8BA484314F7AAF645 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/entry_point.cpp */; };
+		EFF139F8BA484314F7AAF645 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../src/main.cpp */; };
 		F2CFD518E4E2E05ECEDBB262 /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../src/example.cpp */; };
 		693088A7AB377368EE4A018E /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/res.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../data/images */; };
@@ -103,7 +103,7 @@
 		04FE4D4FB640E0DF92DFB865 /* ../src/Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Player.cpp; path = ../src/Player.cpp; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BA41FC88D76540A6905224D6 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		D954BD82D7708B65A08FB6B9 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -221,7 +221,7 @@
 				04FE4D4FB640E0DF92DFB865 /* Player.cpp */, 
 				7F3B12E3C9D554D9FE28101D /* Rocket.cpp */, 
 				F6123B1E6FE4471A00F49751 /* Unit.cpp */, 
-				5DE458993031811A4C7D28C1 /* entry_point.cpp */, 
+				5DE458993031811A4C7D28C1 /* main.cpp */,
 				BA41FC88D76540A6905224D6 /* example.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* res.cpp */, 
 				D954BD82D7708B65A08FB6B9 /* Enemy.h */, 
@@ -370,7 +370,7 @@
 				1E839D002B2BA83FC83A695A /* Player.cpp */, 
 				3A631A475DE035FC53ADE5EA /* Rocket.cpp */, 
 				CD59C69314E9E74CD0A11E03 /* Unit.cpp */, 
-				EFF139F8BA484314F7AAF645 /* entry_point.cpp */, 
+				EFF139F8BA484314F7AAF645 /* main.cpp */,
 				F2CFD518E4E2E05ECEDBB262 /* example.cpp */, 
 				693088A7AB377368EE4A018E /* res.cpp */, 
 

+ 1 - 1
examples/Game/part2/proj.win32/GamePart2.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
+    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Enemy.h" /><ClInclude Include="../src/Game.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/Rocket.h" /><ClInclude Include="../src/Unit.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/res.h" />

+ 0 - 0
examples/Game/part2/src/entry_point.cpp → examples/Game/part2/src/main.cpp


+ 1 - 1
examples/Game/part3/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/res.cpp 
+LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/res.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Game/part3/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(GamePart3 ../src/Enemy.cpp ../src/Game.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart3 ../src/Enemy.cpp ../src/Game.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart3 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Game/part3/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(GamePart3 ../src/Enemy.cpp ../src/Game.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart3 ../src/Enemy.cpp ../src/Game.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Game/part3/proj.ios/GamePart3_ios.xcodeproj/project.pbxproj

@@ -35,7 +35,7 @@
 		F2CFD518E4E2E05ECEDBB262 /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../src/Rocket.cpp */; };
 		693088A7AB377368EE4A018E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Scene.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Unit.cpp */; };
-		F87DC9641C1B8FCF28948580 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/entry_point.cpp */; };
+		F87DC9641C1B8FCF28948580 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/main.cpp */; };
 		9850666D9BEB7BAAA6AAECDC /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/example.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/res.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../data/images */; };
@@ -103,7 +103,7 @@
 		BA41FC88D76540A6905224D6 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		7746CA7A63049ED8F7D6BF42 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		7746CA7A63049ED8F7D6BF42 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		D954BD82D7708B65A08FB6B9 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		B52CCD463855CF91A7FBDB8E /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -229,7 +229,7 @@
 				BA41FC88D76540A6905224D6 /* Rocket.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* Scene.cpp */, 
 				F196143B0370A9D348494ACC /* Unit.cpp */, 
-				7746CA7A63049ED8F7D6BF42 /* entry_point.cpp */, 
+				7746CA7A63049ED8F7D6BF42 /* main.cpp */,
 				D954BD82D7708B65A08FB6B9 /* example.cpp */, 
 				BD0E956CC3A2F7EB94822B5C /* res.cpp */, 
 				B52CCD463855CF91A7FBDB8E /* Enemy.h */, 
@@ -363,7 +363,7 @@
 				F2CFD518E4E2E05ECEDBB262 /* Rocket.cpp */, 
 				693088A7AB377368EE4A018E /* Scene.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Unit.cpp */, 
-				F87DC9641C1B8FCF28948580 /* entry_point.cpp */, 
+				F87DC9641C1B8FCF28948580 /* main.cpp */,
 				9850666D9BEB7BAAA6AAECDC /* example.cpp */, 
 				33E41D858B2ABD49382CD53F /* res.cpp */, 
 

+ 4 - 4
examples/Game/part3/proj.macosx/GamePart3_macosx.xcodeproj/project.pbxproj

@@ -25,7 +25,7 @@
 		F2CFD518E4E2E05ECEDBB262 /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../src/Rocket.cpp */; };
 		693088A7AB377368EE4A018E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Scene.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Unit.cpp */; };
-		F87DC9641C1B8FCF28948580 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/entry_point.cpp */; };
+		F87DC9641C1B8FCF28948580 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/main.cpp */; };
 		9850666D9BEB7BAAA6AAECDC /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/example.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/res.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../data/images */; };
@@ -111,7 +111,7 @@
 		BA41FC88D76540A6905224D6 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		7746CA7A63049ED8F7D6BF42 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		7746CA7A63049ED8F7D6BF42 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		D954BD82D7708B65A08FB6B9 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		B52CCD463855CF91A7FBDB8E /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -237,7 +237,7 @@
 				BA41FC88D76540A6905224D6 /* Rocket.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* Scene.cpp */, 
 				F196143B0370A9D348494ACC /* Unit.cpp */, 
-				7746CA7A63049ED8F7D6BF42 /* entry_point.cpp */, 
+				7746CA7A63049ED8F7D6BF42 /* main.cpp */,
 				D954BD82D7708B65A08FB6B9 /* example.cpp */, 
 				BD0E956CC3A2F7EB94822B5C /* res.cpp */, 
 				B52CCD463855CF91A7FBDB8E /* Enemy.h */, 
@@ -394,7 +394,7 @@
 				F2CFD518E4E2E05ECEDBB262 /* Rocket.cpp */, 
 				693088A7AB377368EE4A018E /* Scene.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Unit.cpp */, 
-				F87DC9641C1B8FCF28948580 /* entry_point.cpp */, 
+				F87DC9641C1B8FCF28948580 /* main.cpp */,
 				9850666D9BEB7BAAA6AAECDC /* example.cpp */, 
 				33E41D858B2ABD49382CD53F /* res.cpp */, 
 

+ 1 - 1
examples/Game/part3/proj.win32/GamePart3.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
+    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Enemy.h" /><ClInclude Include="../src/Game.h" /><ClInclude Include="../src/GameScene.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/MainMenuScene.h" /><ClInclude Include="../src/MyButton.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/Rocket.h" /><ClInclude Include="../src/Scene.h" /><ClInclude Include="../src/Unit.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/res.h" />

+ 0 - 0
examples/Game/part3/src/entry_point.cpp → examples/Game/part3/src/main.cpp


+ 1 - 1
examples/Game/part4/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameMenu.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/res.cpp 
+LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameMenu.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/res.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Game/part4/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(GamePart4 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart4 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart4 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Game/part4/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(GamePart4 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart4 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Game/part4/proj.ios/GamePart4_ios.xcodeproj/project.pbxproj

@@ -36,7 +36,7 @@
 		693088A7AB377368EE4A018E /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Scene.cpp */; };
 		F87DC9641C1B8FCF28948580 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */; };
-		9850666D9BEB7BAAA6AAECDC /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */; };
+		9850666D9BEB7BAAA6AAECDC /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */; };
 		E02A0627DE00D04110ABADA6 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = AFA30E959880563E6ABBBC4F /* ../data/fonts */; };
@@ -106,7 +106,7 @@
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		4E9DE6A8FCBDF43BC876EC90 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -236,7 +236,7 @@
 				2CE4BD5BB9DEF92439C0AB58 /* Rocket.cpp */, 
 				F196143B0370A9D348494ACC /* Scene.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Unit.cpp */, 
-				D954BD82D7708B65A08FB6B9 /* entry_point.cpp */, 
+				D954BD82D7708B65A08FB6B9 /* main.cpp */,
 				BD0E956CC3A2F7EB94822B5C /* example.cpp */, 
 				7623D793B59EF0CD569E6EC2 /* res.cpp */, 
 				4E9DE6A8FCBDF43BC876EC90 /* Enemy.h */, 
@@ -373,7 +373,7 @@
 				693088A7AB377368EE4A018E /* Rocket.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Scene.cpp */, 
 				F87DC9641C1B8FCF28948580 /* Unit.cpp */, 
-				9850666D9BEB7BAAA6AAECDC /* entry_point.cpp */, 
+				9850666D9BEB7BAAA6AAECDC /* main.cpp */,
 				33E41D858B2ABD49382CD53F /* example.cpp */, 
 				3BB41671209E30BDF95D1B16 /* res.cpp */, 
 

+ 4 - 4
examples/Game/part4/proj.macosx/GamePart4_macosx.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@
 		693088A7AB377368EE4A018E /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Scene.cpp */; };
 		F87DC9641C1B8FCF28948580 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */; };
-		9850666D9BEB7BAAA6AAECDC /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */; };
+		9850666D9BEB7BAAA6AAECDC /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */; };
 		E02A0627DE00D04110ABADA6 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = AFA30E959880563E6ABBBC4F /* ../data/fonts */; };
@@ -114,7 +114,7 @@
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		4E9DE6A8FCBDF43BC876EC90 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -244,7 +244,7 @@
 				2CE4BD5BB9DEF92439C0AB58 /* Rocket.cpp */, 
 				F196143B0370A9D348494ACC /* Scene.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Unit.cpp */, 
-				D954BD82D7708B65A08FB6B9 /* entry_point.cpp */, 
+				D954BD82D7708B65A08FB6B9 /* main.cpp */,
 				BD0E956CC3A2F7EB94822B5C /* example.cpp */, 
 				7623D793B59EF0CD569E6EC2 /* res.cpp */, 
 				4E9DE6A8FCBDF43BC876EC90 /* Enemy.h */, 
@@ -404,7 +404,7 @@
 				693088A7AB377368EE4A018E /* Rocket.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Scene.cpp */, 
 				F87DC9641C1B8FCF28948580 /* Unit.cpp */, 
-				9850666D9BEB7BAAA6AAECDC /* entry_point.cpp */, 
+				9850666D9BEB7BAAA6AAECDC /* main.cpp */,
 				33E41D858B2ABD49382CD53F /* example.cpp */, 
 				3BB41671209E30BDF95D1B16 /* res.cpp */, 
 

+ 1 - 1
examples/Game/part4/proj.win32/GamePart4.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameMenu.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
+    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameMenu.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Enemy.h" /><ClInclude Include="../src/Game.h" /><ClInclude Include="../src/GameMenu.h" /><ClInclude Include="../src/GameScene.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/MainMenuScene.h" /><ClInclude Include="../src/MyButton.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/Rocket.h" /><ClInclude Include="../src/Scene.h" /><ClInclude Include="../src/Unit.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/res.h" />

+ 0 - 0
examples/Game/part4/src/entry_point.cpp → examples/Game/part4/src/main.cpp


+ 1 - 1
examples/Game/part5/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameMenu.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/res.cpp 
+LOCAL_SRC_FILES += ../../../src/Enemy.cpp ../../../src/Game.cpp ../../../src/GameMenu.cpp ../../../src/GameScene.cpp ../../../src/Joystick.cpp ../../../src/MainMenuScene.cpp ../../../src/MyButton.cpp ../../../src/Player.cpp ../../../src/Rocket.cpp ../../../src/Scene.cpp ../../../src/Unit.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/res.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Game/part5/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(GamePart5 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart5 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart5 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Game/part5/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(GamePart5 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/entry_point.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
+add_executable(GamePart5 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ../src/GameScene.cpp ../src/Joystick.cpp ../src/MainMenuScene.cpp ../src/MyButton.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Scene.cpp ../src/Unit.cpp ../src/main.cpp ../src/example.cpp ../src/res.cpp  ../src/Enemy.h ../src/Game.h ../src/GameMenu.h ../src/GameScene.h ../src/Joystick.h ../src/MainMenuScene.h ../src/MyButton.h ../src/Player.h ../src/Rocket.h ../src/Scene.h ../src/Unit.h ../src/example.h ../src/res.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Game/part5/proj.ios/GamePart5_ios.xcodeproj/project.pbxproj

@@ -36,7 +36,7 @@
 		693088A7AB377368EE4A018E /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Scene.cpp */; };
 		F87DC9641C1B8FCF28948580 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */; };
-		9850666D9BEB7BAAA6AAECDC /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */; };
+		9850666D9BEB7BAAA6AAECDC /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */; };
 		E02A0627DE00D04110ABADA6 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = AFA30E959880563E6ABBBC4F /* ../data/fonts */; };
@@ -106,7 +106,7 @@
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		4E9DE6A8FCBDF43BC876EC90 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -236,7 +236,7 @@
 				2CE4BD5BB9DEF92439C0AB58 /* Rocket.cpp */, 
 				F196143B0370A9D348494ACC /* Scene.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Unit.cpp */, 
-				D954BD82D7708B65A08FB6B9 /* entry_point.cpp */, 
+				D954BD82D7708B65A08FB6B9 /* main.cpp */,
 				BD0E956CC3A2F7EB94822B5C /* example.cpp */, 
 				7623D793B59EF0CD569E6EC2 /* res.cpp */, 
 				4E9DE6A8FCBDF43BC876EC90 /* Enemy.h */, 
@@ -373,7 +373,7 @@
 				693088A7AB377368EE4A018E /* Rocket.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Scene.cpp */, 
 				F87DC9641C1B8FCF28948580 /* Unit.cpp */, 
-				9850666D9BEB7BAAA6AAECDC /* entry_point.cpp */, 
+				9850666D9BEB7BAAA6AAECDC /* main.cpp */,
 				33E41D858B2ABD49382CD53F /* example.cpp */, 
 				3BB41671209E30BDF95D1B16 /* res.cpp */, 
 

+ 4 - 4
examples/Game/part5/proj.macosx/GamePart5_macosx.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@
 		693088A7AB377368EE4A018E /* ../src/Rocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */; };
 		2B0FCA4EF2CDAB7EF6C6252E /* ../src/Scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F196143B0370A9D348494ACC /* ../src/Scene.cpp */; };
 		F87DC9641C1B8FCF28948580 /* ../src/Unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */; };
-		9850666D9BEB7BAAA6AAECDC /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */; };
+		9850666D9BEB7BAAA6AAECDC /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */; };
 		33E41D858B2ABD49382CD53F /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */; };
 		3BB41671209E30BDF95D1B16 /* ../src/res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */; };
 		E02A0627DE00D04110ABADA6 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = AFA30E959880563E6ABBBC4F /* ../data/fonts */; };
@@ -114,7 +114,7 @@
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Rocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rocket.cpp; path = ../src/Rocket.cpp; sourceTree = "<group>"; };
 		F196143B0370A9D348494ACC /* ../src/Scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scene.cpp; path = ../src/Scene.cpp; sourceTree = "<group>"; };
 		7746CA7A63049ED8F7D6BF42 /* ../src/Unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unit.cpp; path = ../src/Unit.cpp; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		BD0E956CC3A2F7EB94822B5C /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7623D793B59EF0CD569E6EC2 /* ../src/res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = res.cpp; path = ../src/res.cpp; sourceTree = "<group>"; };
 		4E9DE6A8FCBDF43BC876EC90 /* ../src/Enemy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Enemy.h; path = ../src/Enemy.h; sourceTree = "<group>"; };
@@ -244,7 +244,7 @@
 				2CE4BD5BB9DEF92439C0AB58 /* Rocket.cpp */, 
 				F196143B0370A9D348494ACC /* Scene.cpp */, 
 				7746CA7A63049ED8F7D6BF42 /* Unit.cpp */, 
-				D954BD82D7708B65A08FB6B9 /* entry_point.cpp */, 
+				D954BD82D7708B65A08FB6B9 /* main.cpp */,
 				BD0E956CC3A2F7EB94822B5C /* example.cpp */, 
 				7623D793B59EF0CD569E6EC2 /* res.cpp */, 
 				4E9DE6A8FCBDF43BC876EC90 /* Enemy.h */, 
@@ -404,7 +404,7 @@
 				693088A7AB377368EE4A018E /* Rocket.cpp */, 
 				2B0FCA4EF2CDAB7EF6C6252E /* Scene.cpp */, 
 				F87DC9641C1B8FCF28948580 /* Unit.cpp */, 
-				9850666D9BEB7BAAA6AAECDC /* entry_point.cpp */, 
+				9850666D9BEB7BAAA6AAECDC /* main.cpp */,
 				33E41D858B2ABD49382CD53F /* example.cpp */, 
 				3BB41671209E30BDF95D1B16 /* res.cpp */, 
 

+ 1 - 1
examples/Game/part5/proj.win32/GamePart5.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameMenu.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
+    <ClCompile Include="../src/Enemy.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/GameMenu.cpp" /><ClCompile Include="../src/GameScene.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/MainMenuScene.cpp" /><ClCompile Include="../src/MyButton.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/Rocket.cpp" /><ClCompile Include="../src/Scene.cpp" /><ClCompile Include="../src/Unit.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/res.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Enemy.h" /><ClInclude Include="../src/Game.h" /><ClInclude Include="../src/GameMenu.h" /><ClInclude Include="../src/GameScene.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/MainMenuScene.h" /><ClInclude Include="../src/MyButton.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/Rocket.h" /><ClInclude Include="../src/Scene.h" /><ClInclude Include="../src/Unit.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/res.h" />

+ 0 - 0
examples/Game/part5/src/entry_point.cpp → examples/Game/part5/src/main.cpp


+ 1 - 1
examples/HelloWorld/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/entry_point.cpp ../../../src/example.cpp 
+LOCAL_SRC_FILES += ../../../src/main.cpp ../../../src/example.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/HelloWorld/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(HelloWorld ../src/entry_point.cpp ../src/example.cpp  ../src/example.h )
+add_executable(HelloWorld ../src/main.cpp ../src/example.cpp  ../src/example.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(HelloWorld PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/HelloWorld/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(HelloWorld ../src/entry_point.cpp ../src/example.cpp  ../src/example.h )
+add_executable(HelloWorld ../src/main.cpp ../src/example.cpp  ../src/example.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/HelloWorld/proj.ios/HelloWorld_ios.xcodeproj/project.pbxproj

@@ -25,7 +25,7 @@
 		04E9AD3F1876FE84006A7317 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 04E9AD3E1876FE84006A7317 /* Images.xcassets */; };
 		922B9F8F1BBB2FB100B1401E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 922B9F8E1BBB2FB100B1401E /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
 
-		2DC477AC10D6C07B3FE008F6 /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */; };
+		2DC477AC10D6C07B3FE008F6 /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/main.cpp */; };
 		DA49ED8903C628BA578C8670 /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */; };
 		C8860D93875589970329DCCD /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../data/fonts */; };
 		1E839D002B2BA83FC83A695A /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../data/images */; };
@@ -83,7 +83,7 @@
 		04E9AD3E1876FE84006A7317 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name =Images.xcassets; path = HelloWorld/Images.xcassets; sourceTree = "<group>"; };
 		922B9F8F1BBB2FB100B1401E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 922B9F8E1BBB2FB100B1401E /* LaunchScreen.storyboard */; settings = {ASSET_TAGS = (); }; };
 
-		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		360377333740D8A2FD15BBE6 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		F6123B1E6FE4471A00F49751 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../data/fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
@@ -189,7 +189,7 @@
 		04998D4417F8A9ED003441C3 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				360377333740D8A2FD15BBE6 /* entry_point.cpp */, 
+				360377333740D8A2FD15BBE6 /* main.cpp */,
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */, 
 				F6123B1E6FE4471A00F49751 /* example.h */, 
 
@@ -302,7 +302,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2DC477AC10D6C07B3FE008F6 /* entry_point.cpp */, 
+				2DC477AC10D6C07B3FE008F6 /* main.cpp */,
 				DA49ED8903C628BA578C8670 /* example.cpp */, 
 
 			);

+ 4 - 4
examples/HelloWorld/proj.macosx/HelloWorld_macosx.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		049B57321871FBE900EF3C66 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 049B57311871FBE900EF3C66 /* Cocoa.framework */; };
 		049B574A1871FBE900EF3C66 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 049B57491871FBE900EF3C66 /* Images.xcassets */; };
 		1E839D002B2BA83FC83A695A /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* fonts */; };
-		2DC477AC10D6C07B3FE008F6 /* entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* entry_point.cpp */; };
+		2DC477AC10D6C07B3FE008F6 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* main.cpp */; };
 		3A631A475DE035FC53ADE5EA /* images in Resources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* images */; };
 		DA49ED8903C628BA578C8670 /* example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* example.cpp */; };
 		EFF139F8BA484314F7AAF645 /* res.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* res.xml */; };
@@ -93,7 +93,7 @@
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = "../../../..//SDL/Xcode/SDL/SDL.xcodeproj"; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* fonts */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = fonts; path = ../data/fonts; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
-		360377333740D8A2FD15BBE6 /* entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		360377333740D8A2FD15BBE6 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		5DE458993031811A4C7D28C1 /* res.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = res.xml; path = ../data/res.xml; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
 		BA41FC88D76540A6905224D6 /* example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
@@ -186,7 +186,7 @@
 		04A57D391871FF8B0068B1E5 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				360377333740D8A2FD15BBE6 /* entry_point.cpp */,
+				360377333740D8A2FD15BBE6 /* main.cpp */,
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */,
 				BA41FC88D76540A6905224D6 /* example.h */,
 			);
@@ -320,7 +320,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2DC477AC10D6C07B3FE008F6 /* entry_point.cpp in Sources */,
+				2DC477AC10D6C07B3FE008F6 /* main.cpp in Sources */,
 				DA49ED8903C628BA578C8670 /* example.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

+ 1 - 1
examples/HelloWorld/proj.win32/HelloWorld.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" />
+    <ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/example.h" />

+ 3 - 3
examples/HelloWorld/src/example.cpp

@@ -128,7 +128,7 @@ typedef oxygine::intrusive_ptr<MainActor> spMainActor;
 
 void example_preinit() {}
 
-//called from entry_point.cpp
+//called from main.cpp
 void example_init()
 {
     //load xml file with resources definition
@@ -144,12 +144,12 @@ void example_init()
 }
 
 
-//called each frame from entry_point.cpp
+//called each frame from main.cpp
 void example_update()
 {
 }
 
-//called each frame from entry_point.cpp
+//called each frame from main.cpp
 void example_destroy()
 {
     //free previously loaded resources

+ 0 - 0
examples/HelloWorld/src/entry_point.cpp → examples/HelloWorld/src/main.cpp


+ 1 - 1
examples/Match3/proj.android/jni/src/Android.mk

@@ -6,7 +6,7 @@ LOCAL_MODULE := main
 #SDK_ROOT points to folder with SDL and oxygine-framework
 LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES += ../../../src/Board.cpp ../../../src/Jewel.cpp ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/shared.cpp 
+LOCAL_SRC_FILES += ../../../src/Board.cpp ../../../src/Jewel.cpp ../../../src/main.cpp ../../../src/example.cpp ../../../src/shared.cpp
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 1 - 1
examples/Match3/proj.cmake/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(Match3 ../src/Board.cpp ../src/Jewel.cpp ../src/entry_point.cpp ../src/example.cpp ../src/shared.cpp  ../src/Board.h ../src/Jewel.h ../src/example.h ../src/shared.h )
+add_executable(Match3 ../src/Board.cpp ../src/Jewel.cpp ../src/main.cpp ../src/example.cpp ../src/shared.cpp  ../src/Board.h ../src/Jewel.h ../src/example.h ../src/shared.h )
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(Match3 PROPERTIES WIN32_EXECUTABLE TRUE)

+ 1 - 1
examples/Match3/proj.emscripten/CMakeLists.txt

@@ -9,7 +9,7 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 SET(CMAKE_EXECUTABLE_SUFFIX ".html")
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
 
-add_executable(Match3 ../src/Board.cpp ../src/Jewel.cpp ../src/entry_point.cpp ../src/example.cpp ../src/shared.cpp  ../src/Board.h ../src/Jewel.h ../src/example.h ../src/shared.h )
+add_executable(Match3 ../src/Board.cpp ../src/Jewel.cpp ../src/main.cpp ../src/example.cpp ../src/shared.cpp  ../src/Board.h ../src/Jewel.h ../src/example.h ../src/shared.h )
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
 	SET(linkFlags "-g4 ")

+ 4 - 4
examples/Match3/proj.ios/Match3_ios.xcodeproj/project.pbxproj

@@ -27,7 +27,7 @@
 
 		2DC477AC10D6C07B3FE008F6 /* ../src/Board.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/Board.cpp */; };
 		DA49ED8903C628BA578C8670 /* ../src/Jewel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/Jewel.cpp */; };
-		C8860D93875589970329DCCD /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/entry_point.cpp */; };
+		C8860D93875589970329DCCD /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/main.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/example.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../src/shared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/shared.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/fonts */; };
@@ -88,7 +88,7 @@
 
 		360377333740D8A2FD15BBE6 /* ../src/Board.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Board.cpp; path = ../src/Board.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/Jewel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Jewel.cpp; path = ../src/Jewel.cpp; sourceTree = "<group>"; };
-		4DA100C319512824B7570663 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		4DA100C319512824B7570663 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../src/shared.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shared.cpp; path = ../src/shared.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Board.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Board.h; path = ../src/Board.h; sourceTree = "<group>"; };
@@ -200,7 +200,7 @@
 			children = (
 				360377333740D8A2FD15BBE6 /* Board.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* Jewel.cpp */, 
-				4DA100C319512824B7570663 /* entry_point.cpp */, 
+				4DA100C319512824B7570663 /* main.cpp */,
 				04FE4D4FB640E0DF92DFB865 /* example.cpp */, 
 				7F3B12E3C9D554D9FE28101D /* shared.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* Board.h */, 
@@ -319,7 +319,7 @@
 			files = (
 				2DC477AC10D6C07B3FE008F6 /* Board.cpp */, 
 				DA49ED8903C628BA578C8670 /* Jewel.cpp */, 
-				C8860D93875589970329DCCD /* entry_point.cpp */, 
+				C8860D93875589970329DCCD /* main.cpp */,
 				1E839D002B2BA83FC83A695A /* example.cpp */, 
 				3A631A475DE035FC53ADE5EA /* shared.cpp */, 
 

+ 4 - 4
examples/Match3/proj.macosx/Match3_macosx.xcodeproj/project.pbxproj

@@ -17,7 +17,7 @@
 		049B574A1871FBE900EF3C66 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 049B57491871FBE900EF3C66 /* Images.xcassets */; };
 		2DC477AC10D6C07B3FE008F6 /* ../src/Board.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 360377333740D8A2FD15BBE6 /* ../src/Board.cpp */; };
 		DA49ED8903C628BA578C8670 /* ../src/Jewel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF9628FC8D38F9748F0CDEB /* ../src/Jewel.cpp */; };
-		C8860D93875589970329DCCD /* ../src/entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/entry_point.cpp */; };
+		C8860D93875589970329DCCD /* ../src/main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/main.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../src/example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../src/example.cpp */; };
 		3A631A475DE035FC53ADE5EA /* ../src/shared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../src/shared.cpp */; };
 		CD59C69314E9E74CD0A11E03 /* ../data/fonts in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/fonts */; };
@@ -96,7 +96,7 @@
 		049B57501871FBE900EF3C66 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		360377333740D8A2FD15BBE6 /* ../src/Board.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Board.cpp; path = ../src/Board.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/Jewel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Jewel.cpp; path = ../src/Jewel.cpp; sourceTree = "<group>"; };
-		4DA100C319512824B7570663 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
+		4DA100C319512824B7570663 /* ../src/main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../src/main.cpp; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../src/shared.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shared.cpp; path = ../src/shared.cpp; sourceTree = "<group>"; };
 		2CE4BD5BB9DEF92439C0AB58 /* ../src/Board.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Board.h; path = ../src/Board.h; sourceTree = "<group>"; };
@@ -208,7 +208,7 @@
 			children = (
 				360377333740D8A2FD15BBE6 /* Board.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* Jewel.cpp */, 
-				4DA100C319512824B7570663 /* entry_point.cpp */, 
+				4DA100C319512824B7570663 /* main.cpp */,
 				04FE4D4FB640E0DF92DFB865 /* example.cpp */, 
 				7F3B12E3C9D554D9FE28101D /* shared.cpp */, 
 				2CE4BD5BB9DEF92439C0AB58 /* Board.h */, 
@@ -350,7 +350,7 @@
 			files = (
 				2DC477AC10D6C07B3FE008F6 /* Board.cpp */, 
 				DA49ED8903C628BA578C8670 /* Jewel.cpp */, 
-				C8860D93875589970329DCCD /* entry_point.cpp */, 
+				C8860D93875589970329DCCD /* main.cpp */,
 				1E839D002B2BA83FC83A695A /* example.cpp */, 
 				3A631A475DE035FC53ADE5EA /* shared.cpp */, 
 

+ 1 - 1
examples/Match3/proj.win32/Match3.vcxproj

@@ -117,7 +117,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="../src/Board.cpp" /><ClCompile Include="../src/Jewel.cpp" /><ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/shared.cpp" />
+    <ClCompile Include="../src/Board.cpp" /><ClCompile Include="../src/Jewel.cpp" /><ClCompile Include="../src/main.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/shared.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Board.h" /><ClInclude Include="../src/Jewel.h" /><ClInclude Include="../src/example.h" /><ClInclude Include="../src/shared.h" />

+ 0 - 0
examples/Match3/src/entry_point.cpp → examples/Match3/src/main.cpp


+ 9 - 10
tools/gen_template.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-
 import os
 import io
 import glob
@@ -215,7 +214,7 @@ def _run(args):
             # 0405A0091872139000BA6557 /* xmls in Resources */ = {isa =
             # PBXBuildFile; fileRef = 0405A0051872139000BA6557 /* xmls */; };
 
-            # 04A57D601871FF9F0068B1E5 /* entry_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04A57D3A1871FF9F0068B1E5 /* entry_point.cpp */; };
+            # 04A57D601871FF9F0068B1E5 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04A57D3A1871FF9F0068B1E5 /* main.cpp */; };
             # 04A57D621871FF9F0068B1E5 /* example.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 04A57D3C1871FF9F0068B1E5 /* example.cpp */; };
             # 04A57D651871FF9F0068B1E5 /* test.cpp in Sources */ = {isa =
             # PBXBuildFile; fileRef = 04A57D401871FF9F0068B1E5 /* test.cpp */;
@@ -227,7 +226,7 @@ def _run(args):
             values[
                 "PBXBuildFile"] += process(tm, relto, abs_data, data_files, fn)
 
-            # 04A57D3A1871FF9F0068B1E5 /* entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../../src/entry_point.cpp; sourceTree = "<group>"; };
+            # 04A57D3A1871FF9F0068B1E5 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../src/main.cpp; sourceTree = "<group>"; };
             # 04A57D3C1871FF9F0068B1E5 /* example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../../src/example.cpp; sourceTree = "<group>"; };
             # 04A57D3E1871FF9F0068B1E5 /* example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../../src/example.h; sourceTree = "<group>"; };
             # 04A57D401871FF9F0068B1E5 /* test.cpp */ = {isa =
@@ -251,7 +250,7 @@ def _run(args):
             values["PBXFileReference"] = process(
                 tm, relto, args.src, files, fn)
 
-            # 04A57D3A1871FF9F0068B1E5 /* entry_point.cpp */,
+            # 04A57D3A1871FF9F0068B1E5 /* main.cpp */,
             # 04A57D3C1871FF9F0068B1E5 /* example.cpp */,
             # 04A57D3E1871FF9F0068B1E5 /* example.h */,
             # 04A57D401871FF9F0068B1E5 /* test.cpp */,
@@ -280,7 +279,7 @@ def _run(args):
                 tm, relto, abs_data, data_files, fn)
 
             # 04A57D621871FF9F0068B1E5 /* example.cpp in Sources */,
-            # 04A57D601871FF9F0068B1E5 /* entry_point.cpp in Sources */,
+            # 04A57D601871FF9F0068B1E5 /* main.cpp in Sources */,
             # 04A57D651871FF9F0068B1E5 /* test.cpp in Sources */,
             values["PBXSourcesBuildPhase"] = process(
                 tm, relto, args.src, cpp_files, fn)
@@ -356,20 +355,20 @@ def _run(args):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="oxygine projects template generator")
-    parser.add_argument("-t", "--type", help="choose your IDE/build tools",
+        description="Oxygine project generator")
+    parser.add_argument("-t", "--type", help="Target platform",
                         choices=platforms, default="win32")
 
     parser.add_argument(
         "-s", "--src", help="folder with already created source files", default="")
 
     parser.add_argument(
-        "-d", "--dest", help="destination location", default=".")
+        "-d", "--dest", help="Destination folder", default=".")
 
-    parser.add_argument("--hello", help="generates full copy of HelloWorld example. It includes all platforms, data and src folder",
+    parser.add_argument("--hello", help="Generates a full copy of the HelloWorld example targeting all platforms",
                         action="store_true", default=False)
 
-    parser.add_argument("name")
+    parser.add_argument("name", help="Name of the project")
 
     args = parser.parse_args()
     run(args)

+ 1 - 1
tools/others/update_examples_entry.py

@@ -28,5 +28,5 @@ def copy(item, name):
     shutil.copyfile(demo + name, item + "/" + name)
 
 for item in items:
-    copy(item, "src/entry_point.cpp")
+    copy(item, "src/main.cpp")
     # copy(item, "data/app.icf")

+ 16 - 16
tools/oxyresbuild.py

@@ -14,21 +14,21 @@ def str2bool(v):
 def get_parser():
     import argparse
     parser = argparse.ArgumentParser(
-        description="oxyresbuild is being used to processing and optimizing "
-        "xml resources file. It generated <xml-name>.ox folder with "
-        "meta.xml file inside. Meta file has optimized information "
-        "about resources, atlasses."
+        description="oxyresbuild is a tool for optimizing xml resource files."
+        "It generates a <xml-name>.ox folder with a"
+        "meta.xml file inside. The meta file has optimized information "
+        "about resources including atlasses."
     )
     parser.add_argument(
-        "--src_data", help="root data folder contains all resources",
+        "--src_data", help="The data folder containing all the resources",
         default="."
     )
     parser.add_argument(
-        "--dest_data", help="destination data folder for generated files",
+        "--dest_data", help="Destination data folder",
         default="."
     )
     parser.add_argument(
-        "-x", "--xml", help="xml file to process", default=".", required=True)
+        "-x", "--xml", help="The xml file to process", default=".", required=True)
     parser.add_argument("-mw", "--max_width",
                         help="max atlas width", type=int, default=2048)
     parser.add_argument("-mh", "--max_height",
@@ -38,19 +38,19 @@ def get_parser():
         "Value > 1 - upscale, Value < 1 - downscale. Should be used "
         "with --resize", type=float, default=1.0
     )
-    parser.add_argument("-r", "--resize", help="Resize images by scale value",
+    parser.add_argument("-r", "--resize", help="Resize images by a scale value",
                         action="store_true", default=False)
     parser.add_argument("-us", "--upscale",
-                        help="allow upscale. good option for very HD "
+                        help="allow upscale (Recommended for HD resources)"
                         "displays with texture compression",
                         action="store_true", default=False)
-    parser.add_argument("-c", "--compression", help="type of images "
-                        "compression. default is pure rgba8888 packed to png",
+    parser.add_argument("-c", "--compression", help="type of image "
+                        "compression. Defaults to pure rgba8888 packed to png",
                         choices=["pvrtc", "pvrtc2", "etc1", "no"], default="")
-    parser.add_argument("--npot", help="not power of two atlasses",
+    parser.add_argument("--npot", help="Atlasses dimensions are not power of twos",
                         action="store_true", default=False)
     parser.add_argument("-q", "--quality", help="select quality to "
-                        "compressed textures (default is not best)",
+                        "compressed textures (default is fast)",
                         choices=["default", "fast", "best"], default="default")
     parser.add_argument("-d", "--dither", help="added dithering to "
                         "compressed textures (pvr option)",
@@ -61,16 +61,16 @@ def get_parser():
         "-v", "--verbosity", help="verbosity level. 1 - only errors, "
         "2 - normal. Default value is 2", type=int, default=2)
     parser.add_argument("--hash", help="enables creating md5 hash lists for "
-                        "some special files",
+                        "certain special files",
                         action="store_true", default=False)
     parser.add_argument("--debug", help="debug mode",
                         action="store_true", default=False)
-    parser.add_argument("--no_hit_test", help="disables generation "
+    parser.add_argument("--no_hit_test", help="disables generation of"
                         "hit_test data by default",
                         action="store_true", default=False)
     parser.add_argument("--nopng", help="stores images without "
                         "packing to png. TGA will be used if "
-                        "compressiong disabled.",
+                        "compressiong is disabled.",
                         action="store_true", default=False)
     return parser