fixed box2d and emsc examples

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 6dc92dfec2e834ed03d91009629b8d7b17e96029
+node: 292125344971bf024fb7c1690c62b0aa0c6f81a6
 branch: default
 latesttag: oldrender
-latesttagdistance: 361
+latesttagdistance: 364

examples/Demo/proj.emscripten/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(Demo ../src/entry_point.cpp ../src/example.cpp ../src/test.cpp  .
 
 set_target_properties(Demo
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(Demo ${OXYGINE_CORE_LIBS})
 em_link_pre_js(Demo ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/DemoBox2D/proj.android/AndroidManifest.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.oxygine.DemoBox2D"
+      android:versionCode="1"
+      android:versionName="1.0"
+      android:installLocation="auto">
+
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/ic_launcher"
+                 android:allowBackup="true"
+                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                 android:hardwareAccelerated="true" >
+
+        <activity android:name="org.oxygine.DemoBox2D.MainActivity"
+                  android:label="@string/app_name"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+                  android:configChanges="locale|orientation|keyboardHidden" 
+                  android:screenOrientation="landscape">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <!-- Android 2.3.3 -->
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="12" />
+
+    <!-- OpenGL ES 2.0 -->
+    <uses-feature android:glEsVersion="0x00020000" /> 
+
+</manifest> 

examples/DemoBox2D/proj.android/ant.properties

@@ -0,0 +1,18 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  'key.store' for the location of your keystore and
+#  'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+asset.dir=../data

examples/DemoBox2D/proj.android/ant_debug.bat

@@ -0,0 +1 @@
+ant debug

examples/DemoBox2D/proj.android/build-run.bat

@@ -0,0 +1,3 @@
+call build
+call ant_debug
+call install

examples/DemoBox2D/proj.android/build.cmd

@@ -0,0 +1 @@
+ndk-build NDK_MODULE_PATH=../../../../ %*

examples/DemoBox2D/proj.android/build.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This should be changed to the name of your project -->
+<project name="DemoBox2D" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

examples/DemoBox2D/proj.android/default.properties

@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-12

examples/DemoBox2D/proj.android/install.bat

@@ -0,0 +1,2 @@
+adb install -r bin/DemoBox2D-debug.apk
+adb shell am start -n org.oxygine.DemoBox2D/org.oxygine.DemoBox2D.MainActivity

examples/DemoBox2D/proj.android/jni/Android.mk

@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)

examples/DemoBox2D/proj.android/jni/Application.mk

@@ -0,0 +1,5 @@
+APP_STL := gnustl_static
+APP_CPPFLAGS += -fexceptions
+APP_CPPFLAGS += -frtti
+APP_CPPFLAGS += -lstdc++
+APP_ABI := armeabi-v7a

examples/DemoBox2D/proj.android/jni/src/Android.mk

@@ -0,0 +1,40 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LS_CPP=$(subst $(1)/,,$(wildcard $(1)/$(2)/*.cpp))
+
+BOX2D = ../../../Box2D
+BOX2DL = ../../../Box2D/Box2D
+BOX2D_CPP:= $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Collision) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Collision/Shapes) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Common) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Dynamics) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Dynamics/Contacts) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Dynamics/Joints) \
+            $(call LS_CPP,$(LOCAL_PATH),$(BOX2DL)/Rope)
+
+LOCAL_MODULE:= box2d_static
+LOCAL_SRC_FILES:= $(BOX2D_CPP)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(BOX2D)
+LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDES)
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+
+include $(CLEAR_VARS)
+
+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_STATIC_LIBRARIES := oxygine-framework_static box2d_static
+LOCAL_SHARED_LIBRARIES := SDL2
+
+include $(BUILD_SHARED_LIBRARY)
+
+#import from NDK_MODULE_PATH defined in build.cmd
+$(call import-module, oxygine-framework)

examples/DemoBox2D/proj.android/project.properties

@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-12
+android.library.reference.1=../../../..//oxygine-framework/oxygine/SDL/android/lib

examples/DemoBox2D/proj.android/res/layout/main.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="Hello World, SDLActivity"
+    />
+</LinearLayout>
+

examples/DemoBox2D/proj.android/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">DemoBox2D</string>
+</resources>

examples/DemoBox2D/proj.android/src/org/oxygine/DemoBox2D/MainActivity.java

@@ -0,0 +1,8 @@
+package org.oxygine.DemoBox2D;
+
+import org.oxygine.lib.OxygineActivity;
+
+public class MainActivity extends OxygineActivity
+{
+
+}

examples/DemoBox2D/proj.cmake/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.6)
 project (DemoBox2D)
 
-add_subdirectory(../../../..//oxygine-framework oxygine-framework)
+add_subdirectory(../../../ oxygine-framework)
 add_definitions(${OXYGINE_DEFINITIONS})
 include_directories(${OXYGINE_INCLUDE_DIRS})
 link_directories(${OXYGINE_LIBRARY_DIRS})

examples/DemoBox2D/proj.emscripten/CMakeLists.txt

@@ -0,0 +1,25 @@
+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} "-Wno-warn-absolute-paths")
+
+file(GLOB_RECURSE BOX2DSRC
+		../box2d/*.cpp
+		../box2d/*.h)
+
+include_directories(../box2d)
+
+add_executable(DemoBox2D ${BOX2DSRC} ../src/Box2DDebugDraw.cpp ../src/entry_point.cpp ../src/example.cpp  ../src/Box2DDebugDraw.h ../src/example.h )
+
+set_target_properties(DemoBox2D
+    PROPERTIES 
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+
+target_link_libraries(DemoBox2D ${OXYGINE_CORE_LIBS})
+em_link_pre_js(DemoBox2D ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/DemoBox2D/proj.emscripten/build.bat

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

examples/DemoBox2D/proj.emscripten/build_release.bat

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

examples/DemoBox2D/proj.win32/DemoBox2D_vs2010.sln

@@ -1,15 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemoBox2D", "DemoBox2D_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemoBox2D_vs2010", "DemoBox2D_vs2010.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "..\..\..\..\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "..\..\..\..\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oxygine_vs2010", "..\..\..\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "box2d_vs2010", "..\box2d\box2d_vs2010.vcxproj", "{4AEA27BB-EB14-6720-C71B-A52604878DC3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,12 +41,6 @@ Global
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.ActiveCfg = Release|Win32
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.Build.0 = Release|Win32
 		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|x64.ActiveCfg = Release|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Debug|Win32.Build.0 = Debug|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Debug|x64.ActiveCfg = Debug|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Release|Win32.ActiveCfg = Release|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Release|Win32.Build.0 = Release|Win32
-		{4AEA27BB-EB14-6720-C71B-A52604878DC3}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

examples/DemoBox2D/proj.win32/DemoBox2D_vs2010.vcxproj

@@ -51,13 +51,13 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;../box2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../box2d/;../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,35 +69,71 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;../box2d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
-      <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
-      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
-    </ProjectReference>
-    <ProjectReference Include="../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\box2d\box2d_vs2010.vcxproj">
-      <Project>{4aea27bb-eb14-6720-c71b-a52604878dc3}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../src/Box2DDebugDraw.cpp" />
     <ClCompile Include="../src/entry_point.cpp" />
     <ClCompile Include="../src/example.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2LoopShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndPolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Rope\b2Rope.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Box2DDebugDraw.h" />

examples/DemoBox2D/proj.win32/DemoBox2D_vs2010.vcxproj.filters

@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="box2d">
+      <UniqueIdentifier>{76326c69-a386-4c83-a25b-7d99d8ef780a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="../src/Box2DDebugDraw.cpp">
@@ -24,6 +27,141 @@
     <ClCompile Include="../src/example.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2World.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2DynamicTree.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Island.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideEdge.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Distance.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2TimeOfImpact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2GearJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Body.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2PolygonShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollidePolygon.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2Contact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2ContactManager.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Collision.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Fixture.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Rope\b2Rope.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2BlockAllocator.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2Joint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideCircle.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2LoopShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2EdgeShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2BroadPhase.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2CircleShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndPolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Timer.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2StackAllocator.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Math.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2WorldCallbacks.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Draw.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Settings.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="../src/Box2DDebugDraw.h">

examples/DemoBox2D/proj.win32/DemoBox2D_vs2013.sln

@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemoBox2D_vs2013", "DemoBox2D_vs2013.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj", "{52411305-CFE1-4FA8-9885-5729BFC816CF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|Win32.Build.0 = Debug|Win32
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Debug|x64.ActiveCfg = Debug|Win32
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.ActiveCfg = Release|Win32
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|Win32.Build.0 = Release|Win32
+		{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}.Release|x64.ActiveCfg = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.ActiveCfg = Debug|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|x64.Build.0 = Debug|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.ActiveCfg = Release|x64
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|x64.Build.0 = Release|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|Win32.Build.0 = Debug|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.ActiveCfg = Debug|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Debug|x64.Build.0 = Debug|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.ActiveCfg = Release|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|Win32.Build.0 = Release|Win32
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.ActiveCfg = Release|x64
+		{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}.Release|x64.Build.0 = Release|x64
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|Win32.Build.0 = Debug|Win32
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Debug|x64.ActiveCfg = Debug|Win32
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.ActiveCfg = Release|Win32
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|Win32.Build.0 = Release|Win32
+		{52411305-CFE1-4FA8-9885-5729BFC816CF}.Release|x64.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

examples/DemoBox2D/proj.win32/DemoBox2D_vs2013.vcxproj

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>DemoBox2D</RootNamespace>
+    <ProjectName>DemoBox2D</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../box2d/;../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../..//oxygine/src;../../../..//SDL/include;../../..//oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>../../..//oxygine/third_party/win32/libraries;../../..//libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="../../../\oxygine\SDL\win32\oxygine_vs2013.vcxproj">
+      <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="../src/Box2DDebugDraw.cpp" />
+    <ClCompile Include="../src/entry_point.cpp" />
+    <ClCompile Include="../src/example.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2BroadPhase.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideCircle.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideEdge.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollidePolygon.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Collision.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Distance.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2DynamicTree.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\b2TimeOfImpact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2CircleShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2EdgeShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2LoopShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2PolygonShape.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2BlockAllocator.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Draw.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Math.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Settings.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2StackAllocator.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Common\b2Timer.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Body.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2ContactManager.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Fixture.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Island.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2World.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2WorldCallbacks.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2CircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2Contact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2ContactSolver.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndPolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonContact.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2DistanceJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2FrictionJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2GearJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2Joint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2MouseJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PulleyJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RopeJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WeldJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WheelJoint.cpp" />
+    <ClCompile Include="..\box2d\Box2D\Rope\b2Rope.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../src/Box2DDebugDraw.h" />
+    <ClInclude Include="../src/example.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

examples/DemoBox2D/proj.win32/DemoBox2D_vs2013.vcxproj.filters

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="box2d">
+      <UniqueIdentifier>{bb41258f-69bd-4188-a5e2-ad130abb695e}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="../src/Box2DDebugDraw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="../src/entry_point.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="../src/example.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2World.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2DynamicTree.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Island.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideEdge.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Distance.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2TimeOfImpact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2GearJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Body.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2PolygonShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollidePolygon.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2Contact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2ContactManager.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2Collision.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2Fixture.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Rope\b2Rope.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2BlockAllocator.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Joints\b2Joint.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2CollideCircle.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2LoopShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2EdgeShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\b2BroadPhase.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Collision\Shapes\b2CircleShape.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndPolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2LoopAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Timer.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2StackAllocator.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Math.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Dynamics\b2WorldCallbacks.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Draw.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\box2d\Box2D\Common\b2Settings.cpp">
+      <Filter>box2d</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../src/Box2DDebugDraw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="../src/example.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

examples/DemoBox2D/proj.win32/DemoBox2D_vs2013.vcxproj.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>../data</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+   </PropertyGroup>
+</Project>

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

@@ -13,7 +13,7 @@ add_executable(GamePart1 ../src/Game.cpp ../src/Joystick.cpp ../src/Player.cpp .
 
 set_target_properties(GamePart1
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(GamePart1 ${OXYGINE_CORE_LIBS})
 em_link_pre_js(GamePart1 ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

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

@@ -13,7 +13,7 @@ add_executable(GamePart2 ../src/Enemy.cpp ../src/Game.cpp ../src/Joystick.cpp ..
 
 set_target_properties(GamePart2
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(GamePart2 ${OXYGINE_CORE_LIBS})
 em_link_pre_js(GamePart2 ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

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

@@ -13,7 +13,7 @@ add_executable(GamePart3 ../src/Enemy.cpp ../src/Game.cpp ../src/GameScene.cpp .
 
 set_target_properties(GamePart3
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(GamePart3 ${OXYGINE_CORE_LIBS})
 em_link_pre_js(GamePart3 ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

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

@@ -13,7 +13,7 @@ add_executable(GamePart4 ../src/Enemy.cpp ../src/Game.cpp ../src/GameMenu.cpp ..
 
 set_target_properties(GamePart4
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(GamePart4 ${OXYGINE_CORE_LIBS})
 em_link_pre_js(GamePart4 ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/HelloWorld/proj.emscripten/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(HelloWorld ../src/entry_point.cpp ../src/example.cpp  ../src/exam
 
 set_target_properties(HelloWorld
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(HelloWorld ${OXYGINE_CORE_LIBS})
 em_link_pre_js(HelloWorld ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/Match3/proj.emscripten/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(Match3 ../src/entry_point.cpp ../src/example.cpp ../src/gameframe
 
 set_target_properties(Match3
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(Match3 ${OXYGINE_CORE_LIBS})
 em_link_pre_js(Match3 ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

examples/TutorialResources/proj.emscripten/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(TutorialResources ../src/entry_point.cpp ../src/example.cpp  ../s
 
 set_target_properties(TutorialResources
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(TutorialResources ${OXYGINE_CORE_LIBS})
 em_link_pre_js(TutorialResources ${CMAKE_CURRENT_SOURCE_DIR}/data.js)

tools/templates/proj.emscripten/CMakeLists.txt

@@ -13,7 +13,7 @@ add_executable(${PROJECT} ${SRC} ${INCLUDE})
 
 set_target_properties(${PROJECT}
     PROPERTIES 
-    LINK_FLAGS "-s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
+    LINK_FLAGS "-s FULL_ES2=1 -s WARN_ON_UNDEFINED_SYMBOLS=1 -s -Wno-warn-absolute-paths -s TOTAL_MEMORY=64435456")
 
 target_link_libraries(${PROJECT} ${OXYGINE_CORE_LIBS})
 em_link_pre_js(${PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/data.js)