Fix Android build

engine/Android.mk

@@ -100,10 +100,6 @@ LOCAL_MODULE    := crown
 LOCAL_SRC_FILES :=\
 \
 	audio/backend/SLESSoundWorld.cpp\
-\
-	core/bv/Circle.cpp\
-	core/bv/Frustum.cpp\
-	core/bv/Rect.cpp\
 \
 	core/compressors/ZipCompressor.cpp\
 \
@@ -119,11 +115,6 @@ LOCAL_SRC_FILES :=\
 	core/math/Color4.cpp\
 	core/math/Matrix3x3.cpp\
 	core/math/Matrix4x4.cpp\
-	core/math/Plane.cpp\
-	core/math/Quaternion.cpp\
-	core/math/Vector2.cpp\
-	core/math/Vector3.cpp\
-	core/math/Vector4.cpp\
 \
 	core/mem/LinearAllocator.cpp\
 	core/mem/Memory.cpp\
@@ -181,7 +172,6 @@ LOCAL_SRC_FILES :=\
 	lua/LuaKeyboard.cpp\
 	lua/LuaMath.cpp\
 	lua/LuaMatrix4x4.cpp\
-	lua/LuaMatrix4x4.cpp\
 	lua/LuaMesh.cpp\
 	lua/LuaMouse.cpp\
 	lua/LuaPhysicsWorld.cpp\
@@ -200,6 +190,7 @@ LOCAL_SRC_FILES :=\
 	lua/LuaVector3Box.cpp\
 	lua/LuaWindow.cpp\
 	lua/LuaWorld.cpp\
+	lua/LuaMatrix4x4Box.cpp\
 \
 	world/Camera.cpp\
 	world/SceneGraph.cpp\

engine/audio/backend/SLESSoundWorld.cpp

@@ -126,8 +126,7 @@ namespace sles_sound_world
 	{
 		SoundInstanceId id;
 		id.decode((uint32_t) context);
-
-		s_stop_queue->push_back(id);
+		queue::push_back(*s_stop_queue, id);
 	}
 
 	static SLmillibel gain_to_attenuation(SLVolumeItf vol_itf, float volume)
@@ -471,11 +470,11 @@ public:
 
 	virtual void update()
 	{
-		const uint32_t num_to_stop = sles_sound_world::s_stop_queue->size();
+		const uint32_t num_to_stop = queue::size(*sles_sound_world::s_stop_queue);
 		for (uint32_t i = 0; i < num_to_stop; i++)
 		{
-			const SoundInstanceId id = sles_sound_world::s_stop_queue->front();
-			sles_sound_world::s_stop_queue->pop_front();
+			const SoundInstanceId id = queue::front(*sles_sound_world::s_stop_queue);
+			queue::pop_front(*sles_sound_world::s_stop_queue);
 
 			if (!m_playing_sounds.has(id)) continue;
 			stop(id);