fix jni's paths in android

android/jni/Android.mk

@@ -40,61 +40,52 @@ LOCAL_SRC_FILES :=\
 	input/InputManager.cpp\
 \
 	loaders/BMPImageLoader.cpp\
-	loaders/CRWDecoder.cpp\
 	loaders/TGAImageLoader.cpp\
+\
+	os/OS.cpp\
+	os/android/AndroidOS.cpp\
+	os/android/AndroidRenderWindow.cpp\
+	os/android/AndroidTimer.cpp\
 \
 	Filesystem.cpp\
 \
-	renderers/gles/egl/EGLRenderWindow.cpp\
 	renderers/gles/GLESIndexBuffer.cpp\
 	renderers/gles/GLESRenderer.cpp\
-	renderers/gles/GLESSupport.cpp\
-	renderers/gles/GLESTextRenderer.cpp\
 	renderers/gles/GLESTexture.cpp\
 	renderers/gles/GLESTextureManager.cpp\
+	renderers/gles/GLESUtils.cpp\
 	renderers/gles/GLESVertexBuffer.cpp\
 \
-	App.cpp\
 	Camera.cpp\
 	Device.cpp\
-	Entity.cpp\
 	Font.cpp\
 	FontManager.cpp\
-	Frame.cpp\
 	Image.cpp\
 	ImageLoader.cpp\
-	Light.cpp\
 	Log.cpp\
-	LogManager.cpp\
 	Material.cpp\
 	MaterialManager.cpp\
 	MeshChunk.cpp\
 	Mesh.cpp\
 	MeshManager.cpp\
 	MovableCamera.cpp\
-	PhysicNode.cpp\
-	PhysicsManager.cpp\
 	Pixel.cpp\
 	Renderer.cpp\
-	RenderWindow.cpp\
 	ResourceManager.cpp\
-	Scene.cpp\
-	SceneManager.cpp\
-	SceneNode.cpp\
 	Skybox.cpp\
-	SpriteAnimator.cpp\
-	Sprite.cpp\
-	Timer.cpp\
 \
 
 LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/core\
 	$(LOCAL_PATH)/core/math\
+	$(LOCAL_PATH)/core/compressors\
 	$(LOCAL_PATH)/core/containers\
 	$(LOCAL_PATH)/core/bv\
 	$(LOCAL_PATH)/core/mem\
 	$(LOCAL_PATH)/core/streams\
 	$(LOCAL_PATH)/loaders\
+	$(LOCAL_PATH)/os\
+	$(LOCAL_PATH)/os/android\
 	$(LOCAL_PATH)/renderers\
 	$(LOCAL_PATH)/things\
 	$(LOCAL_PATH)/filesystem\
@@ -110,7 +101,7 @@ LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/renderers/gles\
 	$(LOCAL_PATH)/renderers/gles/egl\
 	$(LOCAL_PATH)/input\
-	$(LOCAL_PATH)/input/android
+#	$(LOCAL_PATH)/input/android
 
 LOCAL_CPPFLAGS	:= -g -fexceptions
 LOCAL_LDLIBS	:= -llog -landroid -lEGL -lGLESv1_CM

android/jni/Camera.cpp

@@ -1 +1 @@
-../src/Camera.cpp
+../../src/Camera.cpp

android/jni/Camera.h

@@ -1 +1 @@
-../src/Camera.h
+../../src/Camera.h

android/jni/Config.h

@@ -1 +1 @@
-../src/Config.h
+../../src/Config.h

android/jni/Crown.h

@@ -1 +1 @@
-../src/Crown.h
+../../src/Crown.h

android/jni/Data.h

@@ -1 +1 @@
-../src/Data.h
+../../src/Data.h

android/jni/Device.cpp

@@ -1 +1 @@
-../src/Device.cpp
+../../src/Device.cpp

android/jni/Device.h

@@ -1 +1 @@
-../src/Device.h
+../../src/Device.h

android/jni/EventBuffer.cpp

@@ -1 +1 @@
-../src/EventBuffer.cpp
+../../src/EventBuffer.cpp

android/jni/EventBuffer.h

@@ -1 +1 @@
-../src/EventBuffer.h
+../../src/EventBuffer.h

android/jni/Filesystem.cpp

@@ -1 +1 @@
-../src/Filesystem.cpp
+../../src/Filesystem.cpp

android/jni/Filesystem.h

@@ -1 +1 @@
-../src/Filesystem.h
+../../src/Filesystem.h

android/jni/Font.cpp

@@ -1 +1 @@
-../src/Font.cpp
+../../src/Font.cpp

android/jni/Font.h

@@ -1 +1 @@
-../src/Font.h
+../../src/Font.h

android/jni/FontManager.cpp

@@ -1 +1 @@
-../src/FontManager.cpp
+../../src/FontManager.cpp

android/jni/FontManager.h

@@ -1 +1 @@
-../src/FontManager.h
+../../src/FontManager.h

android/jni/Glyph.h

@@ -1 +1 @@
-../src/Glyph.h
+../../src/Glyph.h

android/jni/Image.cpp

@@ -1 +1 @@
-../src/Image.cpp
+../../src/Image.cpp

android/jni/Image.h

@@ -1 +1 @@
-../src/Image.h
+../../src/Image.h

android/jni/ImageLoader.cpp

@@ -1 +1 @@
-../src/ImageLoader.cpp
+../../src/ImageLoader.cpp

android/jni/ImageLoader.h

@@ -1 +1 @@
-../src/ImageLoader.h
+../../src/ImageLoader.h

android/jni/IndexBuffer.h

@@ -1 +1 @@
-../src/IndexBuffer.h
+../../src/IndexBuffer.h

android/jni/Log.cpp

@@ -1 +1 @@
-../src/Log.cpp
+../../src/Log.cpp

android/jni/Log.h

@@ -1 +1 @@
-../src/Log.h
+../../src/Log.h

android/jni/Material.cpp

@@ -1 +1 @@
-../src/Material.cpp
+../../src/Material.cpp

android/jni/Material.h

@@ -1 +1 @@
-../src/Material.h
+../../src/Material.h

android/jni/MaterialManager.cpp

@@ -1 +1 @@
-../src/MaterialManager.cpp
+../../src/MaterialManager.cpp

android/jni/MaterialManager.h

@@ -1 +1 @@
-../src/MaterialManager.h
+../../src/MaterialManager.h

android/jni/Mesh.cpp

@@ -1 +1 @@
-../src/Mesh.cpp
+../../src/Mesh.cpp

android/jni/Mesh.h

@@ -1 +1 @@
-../src/Mesh.h
+../../src/Mesh.h

android/jni/MeshChunk.cpp

@@ -1 +1 @@
-../src/MeshChunk.cpp
+../../src/MeshChunk.cpp

android/jni/MeshChunk.h

@@ -1 +1 @@
-../src/MeshChunk.h
+../../src/MeshChunk.h

android/jni/MeshLoader.h

@@ -1 +1 @@
-../src/MeshLoader.h
+../../src/MeshLoader.h

android/jni/MeshManager.cpp

@@ -1 +1 @@
-../src/MeshManager.cpp
+../../src/MeshManager.cpp

android/jni/MeshManager.h

@@ -1 +1 @@
-../src/MeshManager.h
+../../src/MeshManager.h

android/jni/MovableCamera.cpp

@@ -1 +1 @@
-../src/MovableCamera.cpp
+../../src/MovableCamera.cpp

android/jni/MovableCamera.h

@@ -1 +1 @@
-../src/MovableCamera.h
+../../src/MovableCamera.h

android/jni/OcclusionQuery.h

@@ -1 +1 @@
-../src/OcclusionQuery.h
+../../src/OcclusionQuery.h

android/jni/Pixel.cpp

@@ -1 +1 @@
-../src/Pixel.cpp
+../../src/Pixel.cpp

android/jni/Pixel.h

@@ -1 +1 @@
-../src/Pixel.h
+../../src/Pixel.h

android/jni/Renderer.cpp

@@ -1 +1 @@
-../src/Renderer.cpp
+../../src/Renderer.cpp

android/jni/Renderer.h

@@ -1 +1 @@
-../src/Renderer.h
+../../src/Renderer.h

android/jni/Resource.h

@@ -1 +1 @@
-../src/Resource.h
+../../src/Resource.h

android/jni/ResourceManager.cpp

@@ -1 +1 @@
-../src/ResourceManager.cpp
+../../src/ResourceManager.cpp

android/jni/ResourceManager.h

@@ -1 +1 @@
-../src/ResourceManager.h
+../../src/ResourceManager.h

android/jni/Skybox.cpp

@@ -1 +1 @@
-../src/Skybox.cpp
+../../src/Skybox.cpp

android/jni/Skybox.h

@@ -1 +1 @@
-../src/Skybox.h
+../../src/Skybox.h

android/jni/SpriteAnimator.cpp

@@ -1 +1 @@
-../src/SpriteAnimator.cpp
+../../src/SpriteAnimator.cpp

android/jni/SpriteAnimator.h

@@ -1 +1 @@
-../src/SpriteAnimator.h
+../../src/SpriteAnimator.h

android/jni/System.h

@@ -1 +1 @@
-../src/System.h
+../../src/System.h

android/jni/Terrain.cpp

@@ -1 +1 @@
-../src/Terrain.cpp
+../../src/Terrain.cpp

android/jni/Terrain.h

@@ -1 +1 @@
-../src/Terrain.h
+../../src/Terrain.h

android/jni/TextRenderer.cpp

@@ -1 +1 @@
-../src/TextRenderer.cpp
+../../src/TextRenderer.cpp

android/jni/TextRenderer.h

@@ -1 +1 @@
-../src/TextRenderer.h
+../../src/TextRenderer.h

android/jni/Texture.h

@@ -1 +1 @@
-../src/Texture.h
+../../src/Texture.h

android/jni/TextureManager.h

@@ -1 +1 @@
-../src/TextureManager.h
+../../src/TextureManager.h

android/jni/VertexBuffer.h

@@ -1 +1 @@
-../src/VertexBuffer.h
+../../src/VertexBuffer.h

android/jni/World.cpp

@@ -1 +1 @@
-../src/World.cpp
+../../src/World.cpp

android/jni/World.h

@@ -1 +1 @@
-../src/World.h
+../../src/World.h

android/jni/core

@@ -1 +1 @@
-../src/core
+../../src/core

android/jni/input

@@ -1 +1 @@
-../src/input
+../../src/input

android/jni/loaders

@@ -1 +1 @@
-../src/loaders
+../../src/loaders

android/jni/os

@@ -1 +1 @@
-../src/os
+../../src/os

android/jni/renderers

@@ -1 +1 @@
-../src/renderers
+../../src/renderers

android/jni/windowing

@@ -1 +1 @@
-../src/windowing
+../../src/windowing