Created
January 18, 2014 04:37
-
-
Save camporter/8486304 to your computer and use it in GitHub Desktop.
Patch to add TextObject for Android and VS2012 projects
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj | |
index f64694d..b5dfac9 100644 | |
--- a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj | |
+++ b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj | |
@@ -276,6 +276,7 @@ | |
<ClCompile Include="..\..\source\2d\sceneobject\Scroller.cc" /> | |
<ClCompile Include="..\..\source\2d\sceneobject\ShapeVector.cc" /> | |
<ClCompile Include="..\..\source\2d\sceneobject\Sprite.cc" /> | |
+ <ClCompile Include="..\..\source\2d\sceneobject\TextObject.cc" /> | |
<ClCompile Include="..\..\source\2d\sceneobject\Trigger.cc" /> | |
<ClCompile Include="..\..\source\2d\scene\ContactFilter.cc" /> | |
<ClCompile Include="..\..\source\2d\scene\DebugDraw.cc" /> | |
@@ -688,6 +689,8 @@ | |
<ClInclude Include="..\..\source\2d\sceneobject\ShapeVector_ScriptBinding.h" /> | |
<ClInclude Include="..\..\source\2d\sceneobject\Sprite.h" /> | |
<ClInclude Include="..\..\source\2d\sceneobject\Sprite_ScriptBinding.h" /> | |
+ <ClInclude Include="..\..\source\2d\sceneobject\TextObject.h" /> | |
+ <ClInclude Include="..\..\source\2d\sceneobject\TextObject_ScriptBinding.h" /> | |
<ClInclude Include="..\..\source\2d\sceneobject\Trigger.h" /> | |
<ClInclude Include="..\..\source\2d\sceneobject\Trigger_ScriptBinding.h" /> | |
<ClInclude Include="..\..\source\2d\scene\ContactFilter.h" /> | |
diff --git a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj.filters b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj.filters | |
index 4770160..62af947 100644 | |
--- a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj.filters | |
+++ b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj.filters | |
@@ -1338,6 +1338,9 @@ | |
<ClCompile Include="..\..\source\console\Package.cc"> | |
<Filter>console</Filter> | |
</ClCompile> | |
+ <ClCompile Include="..\..\source\2d\sceneobject\TextObject.cc"> | |
+ <Filter>2d\sceneobject</Filter> | |
+ </ClCompile> | |
</ItemGroup> | |
<ItemGroup> | |
<ClInclude Include="..\..\source\audio\audio.h"> | |
@@ -2979,6 +2982,12 @@ | |
<ClInclude Include="..\..\source\console\Package.h"> | |
<Filter>console</Filter> | |
</ClInclude> | |
+ <ClInclude Include="..\..\source\2d\sceneobject\TextObject.h"> | |
+ <Filter>2d\sceneobject</Filter> | |
+ </ClInclude> | |
+ <ClInclude Include="..\..\source\2d\sceneobject\TextObject_ScriptBinding.h"> | |
+ <Filter>2d\sceneobject</Filter> | |
+ </ClInclude> | |
</ItemGroup> | |
<ItemGroup> | |
<CustomBuild Include="..\..\source\math\mMath_ASM.asm"> | |
diff --git a/engine/compilers/android/jni/Android.mk b/engine/compilers/android/jni/Android.mk | |
index 0fcda00..e0ca144 100644 | |
--- a/engine/compilers/android/jni/Android.mk | |
+++ b/engine/compilers/android/jni/Android.mk | |
@@ -204,6 +204,7 @@ LOCAL_SRC_FILES := ../../../lib/ljpeg/jcapimin.c \ | |
../../../source/2d/sceneobject/Scroller.cc \ | |
../../../source/2d/sceneobject/ShapeVector.cc \ | |
../../../source/2d/sceneobject/Sprite.cc \ | |
+ ../../../source/2d/sceneobject/TextObject.cc \ | |
../../../source/2d/sceneobject/Trigger.cc \ | |
../../../source/2d/scene/ContactFilter.cc \ | |
../../../source/2d/scene/DebugDraw.cc \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment