add ogg support

engine/compilers/android-studio/app/app.iml

@@ -36,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -65,24 +65,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

engine/compilers/android-studio/app/src/main/jni/Android.mk

@@ -48,6 +48,11 @@ LOCAL_MODULE    := torque2d
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 					$(LOCAL_PATH)/../../../../../../lib/ljpeg \
 					$(LOCAL_PATH)/../../../../../../lib/lpng \
+					$(LOCAL_PATH)/../../../../../../lib/libogg \
+					$(LOCAL_PATH)/../../../../../../lib/libogg/include \
+					$(LOCAL_PATH)/../../../../../../lib/libvorbis \
+					$(LOCAL_PATH)/../../../../../../lib/libvorbis/include \
+					$(LOCAL_PATH)/../../../../../../lib/libvorbis/lib \
     				$(LOCAL_PATH)/../../../../../../source \
     				$(LOCAL_PATH)/../../../../../../source/2d \
     				$(LOCAL_PATH)/../../../../../../source/2d/assets \
@@ -153,6 +158,8 @@ LOCAL_SRC_FILES :=  ../../../../../../lib/ljpeg/jcapimin.c \
 					../../../../../../lib/ljpeg/jquant1.c \
 					../../../../../../lib/ljpeg/jquant2.c \
 					../../../../../../lib/ljpeg/jutils.c \
+					../../../../../../lib/libogg/src/bitwise.c \
+					../../../../../../lib/libogg/src/framing.c \
 					../../../../../../lib/lpng/png.c \
 					../../../../../../lib/lpng/pngerror.c \
 					../../../../../../lib/lpng/pngget.c \
@@ -168,6 +175,28 @@ LOCAL_SRC_FILES :=  ../../../../../../lib/ljpeg/jcapimin.c \
 					../../../../../../lib/lpng/pngwrite.c \
 					../../../../../../lib/lpng/pngwtran.c \
 					../../../../../../lib/lpng/pngwutil.c \
+					../../../../../../lib/libvorbis/analysis.c \
+                    ../../../../../../lib/libvorbis/barkmel.c \
+                    ../../../../../../lib/libvorbis/bitrate.c \
+                    ../../../../../../lib/libvorbis/block.c \
+                    ../../../../../../lib/libvorbis/codebook.c \
+                    ../../../../../../lib/libvorbis/envelope.c \
+                    ../../../../../../lib/libvorbis/floor0.c \
+                    ../../../../../../lib/libvorbis/floor1.c \
+                    ../../../../../../lib/libvorbis/info.c \
+                    ../../../../../../lib/libvorbis/lookup.c \
+                    ../../../../../../lib/libvorbis/lpc.c \
+                    ../../../../../../lib/libvorbis/lsp.c \
+                    ../../../../../../lib/libvorbis/mapping0.c \
+                    ../../../../../../lib/libvorbis/mdct.c \
+                    ../../../../../../lib/libvorbis/psy.c \
+                    ../../../../../../lib/libvorbis/registry.c \
+                    ../../../../../../lib/libvorbis/res0.c \
+                    ../../../../../../lib/libvorbis/sharedbook.c \
+                    ../../../../../../lib/libvorbis/smallft.c \
+                    ../../../../../../lib/libvorbis/synthesis.c \
+                    ../../../../../../lib/libvorbis/vorbisfile.c \
+                    ../../../../../../lib/libvorbis/window.c \
 					../../../../../../source/2d/assets/AnimationAsset.cc \
 					../../../../../../source/2d/assets/ImageAsset.cc \
 					../../../../../../source/2d/assets/ParticleAsset.cc \
@@ -223,7 +252,14 @@ LOCAL_SRC_FILES :=  ../../../../../../lib/ljpeg/jcapimin.c \
 					../../../../../../source/assets/assetTagsManifest.cc \
 					../../../../../../source/assets/declaredAssets.cc \
 					../../../../../../source/assets/referencedAssets.cc \
+                    ../../../../../../source/audio/audio.cc \
+                    ../../../../../../source/audio/audioDataBlock.cc \
+                    ../../../../../../source/audio/audio_ScriptBinding.cc \
+                    ../../../../../../source/audio/audioStreamSourceFactory.cc \
+                    ../../../../../../source/audio/wavStreamSource.cc \
 					../../../../../../source/audio/AudioAsset.cc \
+					../../../../../../source/audio/audioBuffer.cc \
+					../../../../../../source/audio/vorbisStreamSource.cc \
 					../../../../../../source/Box2D/Collision/b2BroadPhase.cpp \
 					../../../../../../source/Box2D/Collision/b2CollideCircle.cpp \
 					../../../../../../source/Box2D/Collision/b2CollideEdge.cpp \
@@ -406,12 +442,6 @@ LOCAL_SRC_FILES :=  ../../../../../../lib/ljpeg/jcapimin.c \
 					../../../../../../source/persistence/tinyXML/tinyxml.cpp \
 					../../../../../../source/persistence/tinyXML/tinyxmlerror.cpp \
 					../../../../../../source/persistence/tinyXML/tinyxmlparser.cpp \
-					../../../../../../source/audio/audio.cc \
-					../../../../../../source/audio/audioBuffer.cc \
-					../../../../../../source/audio/audioDataBlock.cc \
-					../../../../../../source/audio/audio_ScriptBinding.cc \
-					../../../../../../source/audio/audioStreamSourceFactory.cc \
-					../../../../../../source/audio/wavStreamSource.cc \
 					../../../../../../source/component/dynamicConsoleMethodComponent.cpp \
 					../../../../../../source/component/simComponent.cpp \
 					../../../../../../source/component/behaviors/behaviorComponent.cpp \

engine/compilers/android-studio/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 

engine/lib/libogg/include/ogg/config_types.h

@@ -0,0 +1,8 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+typedef short ogg_int16_t;
+typedef unsigned short ogg_uint16_t;
+typedef int ogg_int32_t;
+typedef unsigned int ogg_uint32_t;
+typedef long long ogg_int64_t;
+#endif