Browse Source

android configs

Denis Muratshin 12 years ago
parent
commit
113b6e9ac4
100 changed files with 881 additions and 81 deletions
  1. 2 2
      .hg_archival.txt
  2. BIN
      doc.zip
  3. 3 17
      examples/Demo/proj.android/AndroidManifest.xml
  4. 1 0
      examples/Demo/proj.android/ant.properties
  5. 0 1
      examples/Demo/proj.android/assets/.readme
  6. 1 1
      examples/Demo/proj.android/build.xml
  7. 1 1
      examples/Demo/proj.android/default.properties
  8. 2 2
      examples/Demo/proj.android/install.bat
  9. 0 1
      examples/Demo/proj.android/jni/OxygineActivity.cpp
  10. 2 6
      examples/Demo/proj.android/jni/src/Android.mk
  11. 3 1
      examples/Demo/proj.android/local.properties
  12. 0 20
      examples/Demo/proj.android/proguard-project.txt
  13. 1 1
      examples/Demo/proj.android/project.properties
  14. BIN
      examples/Demo/proj.android/res/drawable-hdpi/ic_launcher.png
  15. BIN
      examples/Demo/proj.android/res/drawable-mdpi/ic_launcher.png
  16. BIN
      examples/Demo/proj.android/res/drawable-xhdpi/ic_launcher.png
  17. BIN
      examples/Demo/proj.android/res/drawable-xxhdpi/ic_launcher.png
  18. 1 1
      examples/Demo/proj.android/res/values/strings.xml
  19. 0 0
      examples/Demo/proj.android/src/.empty
  20. 1 1
      examples/Demo/proj.android/src/org/oxygine/Demo/MainActivity.java
  21. 3 3
      examples/Demo/proj.win32/Demo.sln
  22. 9 9
      examples/Demo/proj.win32/Demo.vcxproj
  23. 33 0
      examples/DemoBox2D/proj.android/AndroidManifest.xml
  24. 3 2
      examples/DemoBox2D/proj.android/ant.properties
  25. 1 0
      examples/DemoBox2D/proj.android/ant_debug.bat
  26. 3 0
      examples/DemoBox2D/proj.android/build-run.bat
  27. 1 0
      examples/DemoBox2D/proj.android/build.cmd
  28. 93 0
      examples/DemoBox2D/proj.android/build.xml
  29. 11 0
      examples/DemoBox2D/proj.android/default.properties
  30. 2 0
      examples/DemoBox2D/proj.android/install.bat
  31. 1 0
      examples/DemoBox2D/proj.android/jni/Android.mk
  32. 5 0
      examples/DemoBox2D/proj.android/jni/Application.mk
  33. 19 0
      examples/DemoBox2D/proj.android/jni/src/Android.mk
  34. 12 0
      examples/DemoBox2D/proj.android/local.properties
  35. 15 0
      examples/DemoBox2D/proj.android/project.properties
  36. BIN
      examples/DemoBox2D/proj.android/res/drawable-hdpi/ic_launcher.png
  37. BIN
      examples/DemoBox2D/proj.android/res/drawable-mdpi/ic_launcher.png
  38. BIN
      examples/DemoBox2D/proj.android/res/drawable-xhdpi/ic_launcher.png
  39. BIN
      examples/DemoBox2D/proj.android/res/drawable-xxhdpi/ic_launcher.png
  40. 13 0
      examples/DemoBox2D/proj.android/res/layout/main.xml
  41. 4 0
      examples/DemoBox2D/proj.android/res/values/strings.xml
  42. 8 0
      examples/DemoBox2D/proj.android/src/org/oxygine/DemoBox2D/MainActivity.java
  43. 52 0
      examples/DemoBox2D/proj.win32/DemoBox2D.sln
  44. 103 0
      examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj
  45. 17 0
      examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj.filters
  46. 33 0
      examples/Game/part1/proj.android/AndroidManifest.xml
  47. 18 0
      examples/Game/part1/proj.android/ant.properties
  48. 1 0
      examples/Game/part1/proj.android/ant_debug.bat
  49. 33 0
      examples/Game/part1/proj.android/bin/AndroidManifest.xml
  50. 2 0
      examples/Game/part1/proj.android/bin/AndroidManifest.xml.d
  51. BIN
      examples/Game/part1/proj.android/bin/GamePart1-debug-unaligned.apk
  52. 5 0
      examples/Game/part1/proj.android/bin/GamePart1-debug-unaligned.apk.d
  53. BIN
      examples/Game/part1/proj.android/bin/GamePart1-debug.apk
  54. BIN
      examples/Game/part1/proj.android/bin/GamePart1.ap_
  55. 32 0
      examples/Game/part1/proj.android/bin/GamePart1.ap_.d
  56. 3 0
      examples/Game/part1/proj.android/bin/R.txt
  57. 10 0
      examples/Game/part1/proj.android/bin/build.prop
  58. BIN
      examples/Game/part1/proj.android/bin/classes.dex
  59. 14 0
      examples/Game/part1/proj.android/bin/classes.dex.d
  60. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/BuildConfig.class
  61. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/MainActivity.class
  62. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$attr.class
  63. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$drawable.class
  64. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$layout.class
  65. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$string.class
  66. BIN
      examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R.class
  67. BIN
      examples/Game/part1/proj.android/bin/dexedLibs/annotations-5732617af432069c65152d0941e77f0f.jar
  68. BIN
      examples/Game/part1/proj.android/bin/dexedLibs/classes-0924831f7d2a229b24448b2a4150d28f.jar
  69. 3 0
      examples/Game/part1/proj.android/bin/proguard.txt
  70. BIN
      examples/Game/part1/proj.android/bin/res/drawable-hdpi/ic_launcher.png
  71. BIN
      examples/Game/part1/proj.android/bin/res/drawable-mdpi/ic_launcher.png
  72. BIN
      examples/Game/part1/proj.android/bin/res/drawable-xhdpi/ic_launcher.png
  73. BIN
      examples/Game/part1/proj.android/bin/res/drawable-xxhdpi/ic_launcher.png
  74. 3 0
      examples/Game/part1/proj.android/build-run.bat
  75. 1 0
      examples/Game/part1/proj.android/build.cmd
  76. 93 0
      examples/Game/part1/proj.android/build.xml
  77. 11 0
      examples/Game/part1/proj.android/default.properties
  78. 18 0
      examples/Game/part1/proj.android/gen/R.java.d
  79. 6 0
      examples/Game/part1/proj.android/gen/org/oxygine/GamePart1/BuildConfig.java
  80. 22 0
      examples/Game/part1/proj.android/gen/org/oxygine/GamePart1/R.java
  81. 2 0
      examples/Game/part1/proj.android/install.bat
  82. 1 0
      examples/Game/part1/proj.android/jni/Android.mk
  83. 5 0
      examples/Game/part1/proj.android/jni/Application.mk
  84. 19 0
      examples/Game/part1/proj.android/jni/src/Android.mk
  85. 12 0
      examples/Game/part1/proj.android/local.properties
  86. 15 0
      examples/Game/part1/proj.android/project.properties
  87. BIN
      examples/Game/part1/proj.android/res/drawable-hdpi/ic_launcher.png
  88. BIN
      examples/Game/part1/proj.android/res/drawable-mdpi/ic_launcher.png
  89. BIN
      examples/Game/part1/proj.android/res/drawable-xhdpi/ic_launcher.png
  90. BIN
      examples/Game/part1/proj.android/res/drawable-xxhdpi/ic_launcher.png
  91. 13 0
      examples/Game/part1/proj.android/res/layout/main.xml
  92. 4 0
      examples/Game/part1/proj.android/res/values/strings.xml
  93. 8 0
      examples/Game/part1/proj.android/src/org/oxygine/GamePart1/MainActivity.java
  94. 3 3
      examples/Game/part1/proj.win32/GamePart1.sln
  95. 9 9
      examples/Game/part1/proj.win32/GamePart1.vcxproj
  96. 33 0
      examples/Game/part2/proj.android/AndroidManifest.xml
  97. 18 0
      examples/Game/part2/proj.android/ant.properties
  98. 1 0
      examples/Game/part2/proj.android/ant_debug.bat
  99. 3 0
      examples/Game/part2/proj.android/build-run.bat
  100. 1 0
      examples/Game/part2/proj.android/build.cmd

+ 2 - 2
.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: bda49b15bf001540038d7dd3097c157d3ce80deb
+node: 19cbd047c4c52d651ff3df8bcd011f9c671b80de
 branch: default
 latesttag: oldrender
-latesttagdistance: 139
+latesttagdistance: 143

BIN
doc.zip


+ 3 - 17
examples/Demo/proj.android/AndroidManifest.xml

@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Replace org.libsdl.app with the identifier of your game below, e.g.
-     com.gamemaker.game
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.oxygine.example"
+      package="org.oxygine.Demo"
       android:versionCode="1"
       android:versionName="1.0"
       android:installLocation="auto">
 
-    <!-- Create a Java class extending SDLActivity and place it in a
-         directory under src matching the package, e.g.
-         	src/com/gamemaker/game/MyGame.java
-
-         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
-         in the XML below.
-
-         An example Java class can be found in README-android.txt
-    -->
     <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.example.MainActivity"
+        <activity android:name="org.oxygine.Demo.MainActivity"
                   android:label="@string/app_name"
                   android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                   android:configChanges="locale|orientation|keyboardHidden" 
@@ -37,11 +25,9 @@
     </application>
 
     <!-- Android 2.3.3 -->
-    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="10" />
+    <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="12" />
 
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" /> 
 
-    <!-- Allow writing to external storage -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
 </manifest> 

+ 1 - 0
examples/Demo/proj.android/ant.properties

@@ -15,3 +15,4 @@
 #  '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

+ 0 - 1
examples/Demo/proj.android/assets/.readme

@@ -1 +0,0 @@
-copy assest to this folder

+ 1 - 1
examples/Demo/proj.android/build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This should be changed to the name of your project -->
-<project name="OxygineDemoSDL" default="help">
+<project name="Demo" 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

+ 1 - 1
examples/Demo/proj.android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-12
+target=android-12

+ 2 - 2
examples/Demo/proj.android/install.bat

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

+ 0 - 1
examples/Demo/proj.android/jni/OxygineActivity.cpp

@@ -1 +0,0 @@
-#include <jni.h>

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

@@ -4,13 +4,9 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := main
 
 #SDK_ROOT points to folder with SDL and oxygine-framework
-SDK_ROOT = /../../../../../../
-SRC := ../../../src
+LOCAL_SRC_FILES := ../../../../../..//SDL/src/main/android/SDL_android_main.c
 
-LOCAL_SRC_FILES :=  $(SDK_ROOT)/SDL/src/main/android/SDL_android_main.c \
-					$(SRC)/entry_point.cpp \
-					$(SRC)/example.cpp \
-					$(SRC)/test.cpp
+LOCAL_SRC_FILES += ../../../src/entry_point.cpp ../../../src/example.cpp ../../../src/test.cpp 
 
 
 LOCAL_STATIC_LIBRARIES := oxygine-framework_static

+ 3 - 1
examples/Demo/proj.android/local.properties

@@ -7,4 +7,6 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=d:/android/android-sdk/
+
+#set sdk.dir or set ENV variable ANDROID_HOME
+#sdk.dir=d:/android/android-sdk/

+ 0 - 20
examples/Demo/proj.android/proguard-project.txt

@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

+ 1 - 1
examples/Demo/proj.android/project.properties

@@ -12,4 +12,4 @@
 
 # Project target.
 target=android-12
-android.library.reference.1=../../../oxygine/SDL/android/lib
+android.library.reference.1=../../../..//oxygine-framework/oxygine/SDL/android/lib

BIN
examples/Demo/proj.android/res/drawable-hdpi/ic_launcher.png


BIN
examples/Demo/proj.android/res/drawable-mdpi/ic_launcher.png


BIN
examples/Demo/proj.android/res/drawable-xhdpi/ic_launcher.png


BIN
examples/Demo/proj.android/res/drawable-xxhdpi/ic_launcher.png


+ 1 - 1
examples/Demo/proj.android/res/values/strings.xml

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

+ 0 - 0
examples/Demo/proj.android/src/.empty


+ 1 - 1
examples/Demo/proj.android/src/org/oxygine/example/MainActivity.java → examples/Demo/proj.android/src/org/oxygine/Demo/MainActivity.java

@@ -1,4 +1,4 @@
-package org.oxygine.example;
+package org.oxygine.Demo;
 
 import org.oxygine.lib.OxygineActivity;
 

+ 3 - 3
examples/Demo/proj.win32/Demo.sln

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

+ 9 - 9
examples/Demo/proj.win32/Demo.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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>glew32.lib;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>
+      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,33 +69,33 @@
       <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../..//oxygine-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/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>
+      <AdditionalLibraryDirectories>../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
+    <ProjectReference Include="../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
       <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
+    <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-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\entry_point.cpp" /><ClCompile Include="..\src\example.cpp" /><ClCompile Include="..\src\test.cpp" />
+    <ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/test.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\example.h" /><ClInclude Include="..\src\test.h" /><ClInclude Include="..\src\TestBox9Sprite.h" /><ClInclude Include="..\src\TestClipRect.h" /><ClInclude Include="..\src\TestDrag.h" /><ClInclude Include="..\src\TestManageRes.h" /><ClInclude Include="..\src\TestMask.h" /><ClInclude Include="..\src\TestPerf.h" /><ClInclude Include="..\src\TestProgressBar.h" /><ClInclude Include="..\src\TestRender2Texture.h" /><ClInclude Include="..\src\TestSliding.h" /><ClInclude Include="..\src\TestTexel2Pixel.h" /><ClInclude Include="..\src\TestText.h" /><ClInclude Include="..\src\TestTextureFormat.h" /><ClInclude Include="..\src\TestTweens.h" /><ClInclude Include="..\src\TestUserShader.h" />
+    <ClInclude Include="../src/example.h" /><ClInclude Include="../src/test.h" /><ClInclude Include="../src/TestBox9Sprite.h" /><ClInclude Include="../src/TestClipRect.h" /><ClInclude Include="../src/TestDrag.h" /><ClInclude Include="../src/TestManageRes.h" /><ClInclude Include="../src/TestMask.h" /><ClInclude Include="../src/TestPerf.h" /><ClInclude Include="../src/TestProgressBar.h" /><ClInclude Include="../src/TestRender2Texture.h" /><ClInclude Include="../src/TestSliding.h" /><ClInclude Include="../src/TestTexel2Pixel.h" /><ClInclude Include="../src/TestText.h" /><ClInclude Include="../src/TestTextureFormat.h" /><ClInclude Include="../src/TestTweens.h" /><ClInclude Include="../src/TestUserShader.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 33 - 0
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> 

+ 3 - 2
examples/Demo/proj.android/build.properties → examples/DemoBox2D/proj.android/ant.properties

@@ -1,6 +1,6 @@
 # This file is used to override default values used by the Ant build system.
-# 
-# This file must be checked in Version Control Systems, as it is
+#
+# 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.
@@ -15,3 +15,4 @@
 #  '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

+ 1 - 0
examples/DemoBox2D/proj.android/ant_debug.bat

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

+ 3 - 0
examples/DemoBox2D/proj.android/build-run.bat

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

+ 1 - 0
examples/DemoBox2D/proj.android/build.cmd

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

+ 93 - 0
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>

+ 11 - 0
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

+ 2 - 0
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

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

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

+ 5 - 0
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

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

@@ -0,0 +1,19 @@
+LOCAL_PATH := $(call my-dir)
+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
+LOCAL_SHARED_LIBRARIES := SDL2
+
+include $(BUILD_SHARED_LIBRARY)
+
+
+#import from NDK_MODULE_PATH defined in build.cmd
+$(call import-module, oxygine-framework)

+ 12 - 0
examples/DemoBox2D/proj.android/local.properties

@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+
+#set sdk.dir or set ENV variable ANDROID_HOME
+#sdk.dir=d:/android/android-sdk/

+ 15 - 0
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

BIN
examples/DemoBox2D/proj.android/res/drawable-hdpi/ic_launcher.png


BIN
examples/DemoBox2D/proj.android/res/drawable-mdpi/ic_launcher.png


BIN
examples/DemoBox2D/proj.android/res/drawable-xhdpi/ic_launcher.png


BIN
examples/DemoBox2D/proj.android/res/drawable-xxhdpi/ic_launcher.png


+ 13 - 0
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>
+

+ 4 - 0
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>

+ 8 - 0
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
+{
+
+}

+ 52 - 0
examples/DemoBox2D/proj.win32/DemoBox2D.sln

@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DemoBox2D", "DemoBox2D.vcxproj", "{2B4D7491-A4F8-4606-B0E3-2A1FCE3C46C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "../../../../\SDL\VisualC\SDL\SDL_VS2010.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "{project}", "../../../../\oxygine-framework\oxygine\SDL\win32\oxygine_vs2010.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

+ 103 - 0
examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.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>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </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>../../../..//oxygine-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>glew32.lib;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>
+    </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-framework/oxygine/src;../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../..//SDL/include;../../../..//oxygine-framework/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>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.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">
+      <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" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="../src/Box2DDebugDraw.h" /><ClInclude Include="../src/example.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

+ 17 - 0
examples/DemoBox2D/proj.win32/DemoBox2D.vcxproj.filters

@@ -0,0 +1,17 @@
+<?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>
+  </ItemGroup>
+</Project>

+ 33 - 0
examples/Game/part1/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.GamePart1"
+      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.GamePart1.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> 

+ 18 - 0
examples/Game/part1/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

+ 1 - 0
examples/Game/part1/proj.android/ant_debug.bat

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

+ 33 - 0
examples/Game/part1/proj.android/bin/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.GamePart1"
+      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.GamePart1.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> 

+ 2 - 0
examples/Game/part1/proj.android/bin/AndroidManifest.xml.d

@@ -0,0 +1,2 @@
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\AndroidManifest.xml : \
+d:\oxygine-framework\examples\Game\part1\proj.android\AndroidManifest.xml \

BIN
examples/Game/part1/proj.android/bin/GamePart1-debug-unaligned.apk


+ 5 - 0
examples/Game/part1/proj.android/bin/GamePart1-debug-unaligned.apk.d

@@ -0,0 +1,5 @@
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\GamePart1-debug-unaligned.apk : \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\GamePart1.ap_ \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes.dex \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\classes.jar \
+d:\android\android-sdk\tools\support\annotations.jar \

BIN
examples/Game/part1/proj.android/bin/GamePart1-debug.apk


BIN
examples/Game/part1/proj.android/bin/GamePart1.ap_


+ 32 - 0
examples/Game/part1/proj.android/bin/GamePart1.ap_.d

@@ -0,0 +1,32 @@
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\GamePart1.ap_ \
+ : D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-hdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-ldpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-mdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-xhdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\layout\main.xml \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\values\strings.xml \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-hdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-ldpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-mdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-xhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-hdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-mdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-xhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-xxhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\layout\main.xml \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\values\strings.xml \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\res\drawable-hdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\res\drawable-mdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\res\drawable-xhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\res\drawable-xxhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\data\app.icf \
+d:\oxygine-framework\examples\Game\part1\data\development.icf \
+d:\oxygine-framework\examples\Game\part1\data\images \
+d:\oxygine-framework\examples\Game\part1\data\xmls \
+d:\oxygine-framework\examples\Game\part1\data\images\finger.png \
+d:\oxygine-framework\examples\Game\part1\data\images\joystick.png \
+d:\oxygine-framework\examples\Game\part1\data\images\ship.png \
+d:\oxygine-framework\examples\Game\part1\data\images\shipengine.png \
+d:\oxygine-framework\examples\Game\part1\data\images\sky.jpg \
+d:\oxygine-framework\examples\Game\part1\data\xmls\ui.xml \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\AndroidManifest.xml \

+ 3 - 0
examples/Game/part1/proj.android/bin/R.txt

@@ -0,0 +1,3 @@
+int drawable ic_launcher 0x7f020000
+int layout main 0x7f030000
+int string app_name 0x7f040000

+ 10 - 0
examples/Game/part1/proj.android/bin/build.prop

@@ -0,0 +1,10 @@
+#Last build type
+#Sun, 02 Feb 2014 19:22:28 +0500
+
+build.last.target=debug
+
+build.last.is.instrumented=false
+
+build.last.is.packaging.debug=true
+
+build.last.is.signing.debug=true

BIN
examples/Game/part1/proj.android/bin/classes.dex


+ 14 - 0
examples/Game/part1/proj.android/bin/classes.dex.d

@@ -0,0 +1,14 @@
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes.dex : \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\BuildConfig.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\MainActivity.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\R$attr.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\R$drawable.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\R$layout.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\R$string.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\GamePart1\R.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\lib\R$drawable.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\lib\R$layout.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\lib\R$string.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\classes\org\oxygine\lib\R.class \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\dexedLibs\classes-0924831f7d2a229b24448b2a4150d28f.jar \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\dexedLibs\annotations-5732617af432069c65152d0941e77f0f.jar \

BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/BuildConfig.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/MainActivity.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$attr.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$drawable.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$layout.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R$string.class


BIN
examples/Game/part1/proj.android/bin/classes/org/oxygine/GamePart1/R.class


BIN
examples/Game/part1/proj.android/bin/dexedLibs/annotations-5732617af432069c65152d0941e77f0f.jar


BIN
examples/Game/part1/proj.android/bin/dexedLibs/classes-0924831f7d2a229b24448b2a4150d28f.jar


+ 3 - 0
examples/Game/part1/proj.android/bin/proguard.txt

@@ -0,0 +1,3 @@
+# view AndroidManifest.xml #generated:14
+-keep class org.oxygine.GamePart1.MainActivity { <init>(...); }
+

BIN
examples/Game/part1/proj.android/bin/res/drawable-hdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/bin/res/drawable-mdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/bin/res/drawable-xhdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/bin/res/drawable-xxhdpi/ic_launcher.png


+ 3 - 0
examples/Game/part1/proj.android/build-run.bat

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

+ 1 - 0
examples/Game/part1/proj.android/build.cmd

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

+ 93 - 0
examples/Game/part1/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="GamePart1" 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>

+ 11 - 0
examples/Game/part1/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

+ 18 - 0
examples/Game/part1/proj.android/gen/R.java.d

@@ -0,0 +1,18 @@
+d:\oxygine-framework\examples\Game\part1\proj.android\gen\org\oxygine\GamePart1\R.java \
+ : D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-hdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-ldpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-mdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\drawable-xhdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\layout\main.xml \
+D:\oxygine-framework\oxygine\SDL\android\lib\res\values\strings.xml \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-hdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-ldpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-mdpi\ic_launcher.png \
+D:\oxygine-framework\oxygine\SDL\android\lib\bin\res\drawable-xhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-hdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-mdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-xhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\drawable-xxhdpi\ic_launcher.png \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\layout\main.xml \
+d:\oxygine-framework\examples\Game\part1\proj.android\res\values\strings.xml \
+d:\oxygine-framework\examples\Game\part1\proj.android\bin\AndroidManifest.xml \

+ 6 - 0
examples/Game/part1/proj.android/gen/org/oxygine/GamePart1/BuildConfig.java

@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package org.oxygine.GamePart1;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}

+ 22 - 0
examples/Game/part1/proj.android/gen/org/oxygine/GamePart1/R.java

@@ -0,0 +1,22 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package org.oxygine.GamePart1;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040000;
+    }
+}

+ 2 - 0
examples/Game/part1/proj.android/install.bat

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

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

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

+ 5 - 0
examples/Game/part1/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

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

@@ -0,0 +1,19 @@
+LOCAL_PATH := $(call my-dir)
+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/entry_point.cpp ../../../src/example.cpp ../../../src/Game.cpp ../../../src/Joystick.cpp ../../../src/Player.cpp ../../../src/res.cpp ../../../src/Unit.cpp 
+
+
+LOCAL_STATIC_LIBRARIES := oxygine-framework_static
+LOCAL_SHARED_LIBRARIES := SDL2
+
+include $(BUILD_SHARED_LIBRARY)
+
+
+#import from NDK_MODULE_PATH defined in build.cmd
+$(call import-module, oxygine-framework)

+ 12 - 0
examples/Game/part1/proj.android/local.properties

@@ -0,0 +1,12 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+
+#set sdk.dir or set ENV variable ANDROID_HOME
+#sdk.dir=d:/android/android-sdk/

+ 15 - 0
examples/Game/part1/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

BIN
examples/Game/part1/proj.android/res/drawable-hdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/res/drawable-mdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/res/drawable-xhdpi/ic_launcher.png


BIN
examples/Game/part1/proj.android/res/drawable-xxhdpi/ic_launcher.png


+ 13 - 0
examples/Game/part1/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>
+

+ 4 - 0
examples/Game/part1/proj.android/res/values/strings.xml

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

+ 8 - 0
examples/Game/part1/proj.android/src/org/oxygine/GamePart1/MainActivity.java

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

+ 3 - 3
examples/Game/part1/proj.win32/GamePart1.sln

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

+ 9 - 9
examples/Game/part1/proj.win32/GamePart1.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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../../..//SDL/include;../../../../..//oxygine-framework/oxygine/third_party/win32/pthreads/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>glew32.lib;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>
+      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,33 +69,33 @@
       <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../../..//oxygine-framework/oxygine/src;../../../../..//oxygine-framework/oxygine/third_party/win32/glew;../../../../..//SDL/include;../../../../..//oxygine-framework/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>
+      <AdditionalLibraryDirectories>../../../../..//oxygine-framework/oxygine/third_party/win32/libraries;../../../../..//oxygine-framework/libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>glew32.lib;libjpeg.lib;libpng.lib;libzlib.lib;opengl32.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
+    <ProjectReference Include="../../../../../\SDL\VisualC\SDLmain\SDLmain_VS2010.vcxproj">
       <Project>{da956fd3-e142-46f2-9dd5-c78bebb56b7a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\SDL\VisualC\SDL\SDL_VS2010.vcxproj">
+    <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-framework\oxygine\SDL\win32\oxygine_vs2010.vcxproj">
       <Project>{52411305-cfe1-4fa8-9885-5729bfc816cf}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\entry_point.cpp" /><ClCompile Include="..\src\example.cpp" /><ClCompile Include="..\src\Game.cpp" /><ClCompile Include="..\src\Joystick.cpp" /><ClCompile Include="..\src\Player.cpp" /><ClCompile Include="..\src\res.cpp" /><ClCompile Include="..\src\Unit.cpp" />
+    <ClCompile Include="../src/entry_point.cpp" /><ClCompile Include="../src/example.cpp" /><ClCompile Include="../src/Game.cpp" /><ClCompile Include="../src/Joystick.cpp" /><ClCompile Include="../src/Player.cpp" /><ClCompile Include="../src/res.cpp" /><ClCompile Include="../src/Unit.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\example.h" /><ClInclude Include="..\src\Game.h" /><ClInclude Include="..\src\Joystick.h" /><ClInclude Include="..\src\Player.h" /><ClInclude Include="..\src\res.h" /><ClInclude Include="..\src\Unit.h" />
+    <ClInclude Include="../src/example.h" /><ClInclude Include="../src/Game.h" /><ClInclude Include="../src/Joystick.h" /><ClInclude Include="../src/Player.h" /><ClInclude Include="../src/res.h" /><ClInclude Include="../src/Unit.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

+ 33 - 0
examples/Game/part2/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.GamePart2"
+      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.GamePart2.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> 

+ 18 - 0
examples/Game/part2/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

+ 1 - 0
examples/Game/part2/proj.android/ant_debug.bat

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

+ 3 - 0
examples/Game/part2/proj.android/build-run.bat

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

+ 1 - 0
examples/Game/part2/proj.android/build.cmd

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

Some files were not shown because too many files changed in this diff