From f17a216f31b936a32e608b185eda1454b73ca113 Mon Sep 17 00:00:00 2001 From: dottools Date: Sun, 13 Mar 2016 15:57:49 -0500 Subject: [PATCH 1/2] Update Android Studio makefile Add audioDescriptions.cc to makefile per PR #335 changes. --- engine/compilers/android-studio/app/src/main/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/compilers/android-studio/app/src/main/jni/Android.mk b/engine/compilers/android-studio/app/src/main/jni/Android.mk index 024d666c6..22b941a0d 100644 --- a/engine/compilers/android-studio/app/src/main/jni/Android.mk +++ b/engine/compilers/android-studio/app/src/main/jni/Android.mk @@ -255,6 +255,7 @@ LOCAL_SRC_FILES := ../../../../../../lib/ljpeg/jcapimin.c \ ../../../../../../source/assets/referencedAssets.cc \ ../../../../../../source/audio/audio.cc \ ../../../../../../source/audio/audioDataBlock.cc \ + ../../../../../../source/audio/audioDescriptions.cc \ ../../../../../../source/audio/audio_ScriptBinding.cc \ ../../../../../../source/audio/audioStreamSourceFactory.cc \ ../../../../../../source/audio/wavStreamSource.cc \ From f21fb43a4c86bbbf8dcc5dd16249921845c21373 Mon Sep 17 00:00:00 2001 From: dottools Date: Sun, 13 Mar 2016 15:59:35 -0500 Subject: [PATCH 2/2] Update Visual Studio 2013 project Synchronize VS2013 project with VS2015 project files per PR #335 changes. --- engine/compilers/VisualStudio 2013/Torque 2D.vcxproj | 3 +++ .../VisualStudio 2013/Torque 2D.vcxproj.filters | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj index 9831a62d0..4e4fb0d4c 100644 --- a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj +++ b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj @@ -296,6 +296,7 @@ + @@ -710,6 +711,7 @@ + @@ -762,6 +764,7 @@ + diff --git a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters index 676b14b8b..3787194a3 100644 --- a/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters +++ b/engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters @@ -1440,6 +1440,9 @@ bitmapFont + + audio + @@ -2477,6 +2480,9 @@ 2d\sceneobject + + 2d\sceneobject + 2d\sceneobject @@ -3189,6 +3195,9 @@ bitmapFont + + audio +