Browse Source

Merge pull request #336 from dottools/PRupdateProjects

Update Android Studio and Visual Studio 2013 project files
Peter Robinson 9 years ago
parent
commit
66a5b6c42e

+ 3 - 0
engine/compilers/VisualStudio 2013/Torque 2D.vcxproj

@@ -296,6 +296,7 @@
     <ClCompile Include="..\..\source\assets\declaredAssets.cc" />
     <ClCompile Include="..\..\source\assets\referencedAssets.cc" />
     <ClCompile Include="..\..\source\audio\AudioAsset.cc" />
+    <ClCompile Include="..\..\source\audio\audioDescriptions.cc" />
     <ClCompile Include="..\..\source\audio\audio_ScriptBinding.cc" />
     <ClCompile Include="..\..\source\audio\vorbisStreamSource.cc" />
     <ClCompile Include="..\..\source\bitmapFont\BitmapFont.cc" />
@@ -710,6 +711,7 @@
     <ClInclude Include="..\..\source\2d\sceneobject\ParticlePlayer_ScriptBinding.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObject.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectList.h" />
+    <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectMoveToEvent.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectRotateToEvent.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectSet.h" />
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectSet_ScriptBinding.h" />
@@ -762,6 +764,7 @@
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedUpdateVisitor.h" />
     <ClInclude Include="..\..\source\assets\tamlAssetReferencedVisitor.h" />
     <ClInclude Include="..\..\source\audio\AudioAsset.h" />
+    <ClInclude Include="..\..\source\audio\audioDescriptions.h" />
     <ClInclude Include="..\..\source\audio\vorbisStreamSource.h" />
     <ClInclude Include="..\..\source\bitmapFont\BitmapFont.h" />
     <ClInclude Include="..\..\source\bitmapFont\BitmapFontCharacter.h" />

+ 9 - 0
engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters

@@ -1440,6 +1440,9 @@
     <ClCompile Include="..\..\source\bitmapFont\BitmapFontCharacter.cc">
       <Filter>bitmapFont</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\audio\audioDescriptions.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\source\audio\audio.h">
@@ -2477,6 +2480,9 @@
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObject_ScriptBinding.h">
       <Filter>2d\sceneobject</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectMoveToEvent.h">
+      <Filter>2d\sceneobject</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\source\2d\sceneobject\SceneObjectRotateToEvent.h">
       <Filter>2d\sceneobject</Filter>
     </ClInclude>
@@ -3189,6 +3195,9 @@
     <ClInclude Include="..\..\source\bitmapFont\BitmapFontLineInfo.h">
       <Filter>bitmapFont</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\audio\audioDescriptions.h">
+      <Filter>audio</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\source\math\mMath_ASM.asm">

+ 1 - 0
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 \