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

.gitignore

@@ -22,7 +22,7 @@ examples/*/proj.win32/ipch/
 oxygine/SDL/win32/Release*
 oxygine/SDL/win32/Debug*
 oxygine/system_data/data/
-examples/*/proj.emscripten/data.js
+**/data.js
 oxygine/system_data/system.zip
 examples/Game/*/proj.emscripten/data.js
 oxygine/SDL/android/lib/gen/
@@ -56,6 +56,8 @@ oxygine/SDL/android/extension/bin/
 *.exp
 *.pdb
 */Debug_v*
+**/build_emsc/
+**/build_emsc_release/
 build
 /examples/Demo/proj.cmake/mingw
 **/proj.marmalade/build_demo_vc*

examples/Demo/proj.cmake/CMakeLists.txt

@@ -7,12 +7,22 @@ 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/main.cpp ../src/example.cpp ../src/test.cpp
-	../src/Counter.h ../src/TestAlphaHitTest.h ../src/TestBox9Sprite.h ../src/TestClipRect.h
-	../src/TestColorFont.h ../src/TestTweenShine.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/example.h ../src/test.h )
+add_executable(Demo ../src/Counter.cpp ../src/example.cpp ../src/main.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/TestEdges.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/TestTweenPostProcessing.h ../src/TestTweenShine.h ../src/TestTweenText.h ../src/TestTweens.h ../src/TestUserShader.h ../src/TestUserShader2.h ../src/example.h ../src/test.h )
+target_link_libraries(Demo ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(Demo PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(Demo ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(Demo PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(Demo  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/DemoBox2D/proj.emscripten/build.bat → examples/Demo/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/HelloWorld/proj.emscripten/build_release.bat → examples/Demo/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Demo/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (Demo)
-
-add_subdirectory(../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(Demo PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(Demo ${OXYGINE_CORE_LIBS})
-em_link_pre_js(Demo  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/DemoBox2D/proj.cmake/CMakeLists.txt

@@ -18,6 +18,20 @@ include_directories(../box2d)
 
 target_link_libraries(DemoBox2D ${OXYGINE_CORE_LIBS})
 
+
+
+
 if (WIN32) #disable console mode for VC++
 	set_target_properties(DemoBox2D PROPERTIES WIN32_EXECUTABLE TRUE)
-endif(WIN32)
+endif(WIN32)
+
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(DemoBox2D PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(DemoBox2D  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Demo/proj.emscripten/build.bat → examples/DemoBox2D/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Match3/proj.emscripten/build_release.bat → examples/DemoBox2D/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/DemoBox2D/proj.emscripten/CMakeLists.txt

@@ -1,33 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (DemoBox2D)
-
-add_subdirectory(../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-link_directories(${OXYGINE_LIBRARY_DIRS})
-
-SET(CMAKE_EXECUTABLE_SUFFIX ".html")
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
-
-file(GLOB_RECURSE BOX2DSRC
-		../box2d/*.cpp
-		../box2d/*.h)
-
-include_directories(../box2d)
-
-add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/main.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
-
-
-
-if (CMAKE_BUILD_TYPE STREQUAL Debug)
-	SET(linkFlags "-g4 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(DemoBox2D PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(DemoBox2D ${OXYGINE_CORE_LIBS})
-em_link_pre_js(DemoBox2D ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part1/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/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 )
+add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Unit.cpp ../src/example.cpp ../src/main.cpp ../src/res.cpp  ../src/Game.h ../src/Joystick.h ../src/Player.h ../src/Unit.h ../src/example.h ../src/res.h )
+target_link_libraries(GamePart1 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart1 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(GamePart1 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(GamePart1 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(GamePart1  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Game/part3/proj.emscripten/build.bat → examples/Game/part1/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part2/proj.emscripten/build_release.bat → examples/Game/part1/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part1/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (GamePart1)
-
-add_subdirectory(../../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(GamePart1 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(GamePart1 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(GamePart1  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part2/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/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 )
+add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp ../src/Rocket.cpp ../src/Unit.cpp ../src/example.cpp ../src/main.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 )
+target_link_libraries(GamePart2 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart2 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(GamePart2 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(GamePart2 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(GamePart2  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Game/part4/proj.emscripten/build.bat → examples/Game/part2/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part1/proj.emscripten/build_release.bat → examples/Game/part2/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part2/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (GamePart2)
-
-add_subdirectory(../../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(GamePart2 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(GamePart2 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(GamePart2  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part3/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/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 )
+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/example.cpp ../src/main.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 )
+target_link_libraries(GamePart3 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart3 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(GamePart3 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(GamePart3 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(GamePart3  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Game/part1/proj.emscripten/build.bat → examples/Game/part3/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part3/proj.emscripten/build_release.bat → examples/Game/part3/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part3/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (GamePart3)
-
-add_subdirectory(../../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(GamePart3 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(GamePart3 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(GamePart3  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part4/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/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 )
+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/example.cpp ../src/main.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 )
+target_link_libraries(GamePart4 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart4 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(GamePart4 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(GamePart4 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(GamePart4  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Game/part2/proj.emscripten/build.bat → examples/Game/part4/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part4/proj.emscripten/build_release.bat → examples/Game/part4/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Game/part4/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (GamePart4)
-
-add_subdirectory(../../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(GamePart4 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(GamePart4 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(GamePart4  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part5/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/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 )
+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/example.cpp ../src/main.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 )
+target_link_libraries(GamePart5 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(GamePart5 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(GamePart5 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(GamePart5 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(GamePart5  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Game/part5/proj.cmake/build_emsc.bat

@@ -0,0 +1,7 @@
+python ../../../..//tools/others/embed_folder_js.py -s ../data
+
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
+make
+cd ..

examples/Game/part5/proj.cmake/build_emsc_release.bat

@@ -0,0 +1,7 @@
+python ../../../..//tools/others/embed_folder_js.py -s ../data
+
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
+make
+cd ..

examples/Game/part5/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (GamePart5)
-
-add_subdirectory(../../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(GamePart5 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(GamePart5 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(GamePart5  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Game/part5/proj.emscripten/build.bat

@@ -1,7 +0,0 @@
-python ../../../..//tools/others/embed_folder_js.py -s ../data
-
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
-make
-cd ..

examples/Game/part5/proj.emscripten/build_release.bat

@@ -1,7 +0,0 @@
-python ../../../..//tools/others/embed_folder_js.py -s ../data
-
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
-make
-cd ..

examples/HelloWorld/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-add_executable(HelloWorld ../src/main.cpp ../src/example.cpp  ../src/example.h )
+add_executable(HelloWorld ../src/example.cpp ../src/main.cpp  ../src/example.h )
+target_link_libraries(HelloWorld ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(HelloWorld PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(HelloWorld ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(HelloWorld PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(HelloWorld  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/HelloWorld/proj.emscripten/build.bat → examples/HelloWorld/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Demo/proj.emscripten/build_release.bat → examples/HelloWorld/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/HelloWorld/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (HelloWorld)
-
-add_subdirectory(../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-link_directories(${OXYGINE_LIBRARY_DIRS})
-
-SET(CMAKE_EXECUTABLE_SUFFIX ".html")
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
-
-add_executable(HelloWorld ../src/main.cpp ../src/example.cpp  ../src/example.h )
-
-if (CMAKE_BUILD_TYPE STREQUAL Debug)
-	SET(linkFlags "-g4 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(HelloWorld PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(HelloWorld ${OXYGINE_CORE_LIBS})
-em_link_pre_js(HelloWorld  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Match3/proj.cmake/CMakeLists.txt

@@ -7,10 +7,22 @@ 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/main.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/example.cpp ../src/main.cpp ../src/shared.cpp  ../src/Board.h ../src/Jewel.h ../src/example.h ../src/shared.h )
+target_link_libraries(Match3 ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(Match3 PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(Match3 ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(Match3 PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(Match3  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

examples/Match3/proj.emscripten/build.bat → examples/Match3/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/DemoBox2D/proj.emscripten/build_release.bat → examples/Match3/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ../../..//tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

examples/Match3/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (Match3)
-
-add_subdirectory(../../../ oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-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/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 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(Match3 PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(Match3 ${OXYGINE_CORE_LIBS})
-em_link_pre_js(Match3  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

readme/emscripten.txt

@@ -25,9 +25,9 @@ How to build. Steps:
 
 
 - Select any example from examples folder. For example "Demo"
-- Go to folder oxygine-framework/examples/Demo/proj.emscripten
-- run: build
-- Go to new created build folder and open Demo.html with Browser
+- Go to folder oxygine-framework/examples/Demo/proj.cmake
+- run: build_emsc.bat
+- Go to new created "build_emsc" folder and open Demo.html with Browser
 
 
 2b. You could generate your own emscipten build configuration
@@ -37,4 +37,4 @@ How to build. Steps:
   oxygine-framework\tools\gen_template.py
 
 example:
-	python gen_template.py MyProject -t emscripten -d path/to/MyProject/
+	python gen_template.py MyProject -t cmake -d path/to/MyProject/

tools/gen_template.py

@@ -16,7 +16,7 @@ if sys.version_info[0] >= 3:
     unicode = str
 
 
-platforms = ("win32", "android", "macosx", "ios", "cmake", "emscripten", "all")
+platforms = ("win32", "android", "macosx", "ios", "cmake", "all")
 
 
 def relpath(a, b):

tools/others/gen_templates.py

@@ -14,7 +14,7 @@ def gen(path, project=""):
     projs = ("ios", )
     # projs = ("macosx", )
     #projs = ("win32", )
-    # projs = ("cmake", )
+    projs = ("cmake", )
     # projs = ("android", )
     # projs = ("emscripten", )
 

tools/templates/proj.cmake/CMakeLists.txt

@@ -8,9 +8,21 @@ link_directories(${OXYGINE_LIBRARY_DIRS})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_executable(${PROJECT} ${SRC} ${INCLUDE})
+target_link_libraries(${PROJECT} ${OXYGINE_CORE_LIBS})
+
+
 
 if (WIN32) #disable console mode for VC++
 	set_target_properties(${PROJECT} PROPERTIES WIN32_EXECUTABLE TRUE)
 endif(WIN32)
 
-target_link_libraries(${PROJECT} ${OXYGINE_CORE_LIBS})
+
+
+if (EMSCRIPTEN)
+	SET(CMAKE_EXECUTABLE_SUFFIX ".html")
+	set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
+
+	set_target_properties(${PROJECT} PROPERTIES LINK_FLAGS "${linkFlags}")
+
+	em_link_pre_js(${PROJECT}  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)
+endif(EMSCRIPTEN)

tools/templates/proj.emscripten/build.bat → tools/templates/proj.cmake/build_emsc.bat

@@ -1,7 +1,7 @@
 python ${OXYGINE}/tools/others/embed_folder_js.py -s ../data
 
-mkdir build
-cd build
-cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc
+cd build_emsc
+cmake -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

tools/templates/proj.emscripten/build_release.bat → tools/templates/proj.cmake/build_emsc_release.bat

@@ -1,7 +1,7 @@
 python ${OXYGINE}/tools/others/embed_folder_js.py -s ../data
 
-mkdir build_release
-cd build_release
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" .. 
+mkdir build_emsc_release
+cd build_emsc_release
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="%EMSCRIPTEN%/cmake/Modules/Platform/emscripten.cmake" -G"Unix Makefiles" ..
 make
 cd ..

tools/templates/proj.emscripten/CMakeLists.txt

@@ -1,25 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-project (${PROJECT})
-
-add_subdirectory(${OXYGINE} oxygine-framework)
-add_definitions(${OXYGINE_DEFINITIONS})
-include_directories(${OXYGINE_INCLUDE_DIRS})
-link_directories(${OXYGINE_LIBRARY_DIRS})
-
-SET(CMAKE_EXECUTABLE_SUFFIX ".html")
-set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} " -std=c++11")
-
-add_executable(${PROJECT} ${SRC} ${INCLUDE})
-
-if (CMAKE_BUILD_TYPE STREQUAL Debug)
-	SET(linkFlags "-g4 ")
-else() # Either MinSizeRel, RelWithDebInfo or Release, all which run with optimizations enabled.
-	SET(linkFlags "-O2 ")
-endif()
-
-set(linkFlags "${linkFlags} -s NO_EXIT_RUNTIME=1 -s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 --memory-init-file 0 -s TOTAL_MEMORY=50331648")
-
-set_target_properties(${PROJECT} PROPERTIES LINK_FLAGS "${linkFlags}")
-
-target_link_libraries(${PROJECT} ${OXYGINE_CORE_LIBS})
-em_link_pre_js(${PROJECT}  ${OXYGINE_JS_LIBRARIES}  ${CMAKE_CURRENT_SOURCE_DIR}/data.js)