136 Siika2D/Siika2D/ProjectUpgradeBackup_20151009_1158288578/Siika2D.vcxproj
View file
@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="NsightTegraProject">
<NsightTegraProjectRevisionNumber>11</NsightTegraProjectRevisionNumber>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Tegra-Android">
<Configuration>Debug</Configuration>
<Platform>Tegra-Android</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Tegra-Android">
<Configuration>Release</Configuration>
<Platform>Tegra-Android</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{12722FF2-AD9D-4FBB-AD5D-BED439098332}</ProjectGuid>
<RootNamespace>Siika2D</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Tegra-Android'">
<AndroidTargetAPI>android-16</AndroidTargetAPI>
<AndroidNativeAPI>UseTarget</AndroidNativeAPI>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Tegra-Android'">
<AndroidTargetAPI>android-16</AndroidTargetAPI>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<PropertyGroup Label="UserMacros">
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Tegra-Android'">
<ClCompile>
<CppLanguageStandard>gnu++11</CppLanguageStandard>
<PreprocessorDefinitions>DISABLE_IMPORTGL</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\Siika2D\inc\SDL2-2.0.3\include;$(SolutionDir)\Siika2D\inc\lodepng;$(SolutionDir)\Siika2D\inc\glm;$(SolutionDir)\Siika2D\inc\freetype\include;$(SolutionDir)\Siika2D\inc\Box2D</AdditionalIncludeDirectories>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
</ClCompile>
<Link>
<AdditionalDependencies>android;EGL;GLESv2;freetype;Box2D;OpenSLES</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\Siika2D\inc\SDL2-2.0.3\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Tegra-Android'">
<ClCompile>
<CppLanguageStandard>gnu++11</CppLanguageStandard>
<PreprocessorDefinitions>DISABLE_IMPORTGL</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir)\Siika2D\inc\SDL2-2.0.3\include;$(SolutionDir)\Siika2D\inc\lodepng;$(SolutionDir)\Siika2D\inc\glm;$(SolutionDir)\Siika2D\inc\freetype\include;$(SolutionDir)\Siika2D\inc\Box2D</AdditionalIncludeDirectories>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
</ClCompile>
<Link>
<AdditionalDependencies>android;EGL;GLESv2;freetype;Box2D;OpenSLES</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)\Siika2D\inc\SDL2-2.0.3\lib\x86;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<AndroidBuild Include="AndroidManifest.xml" />
<AndroidBuild Include="res\values\strings.xml" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="engine\audio\Audio.cpp" />
<ClCompile Include="engine\audio\AudioInitializer.cpp" />
<ClCompile Include="engine\audio\AudioManager.cpp" />
<ClCompile Include="engine\audio\AudioPlayer.cpp" />
<ClCompile Include="engine\core\ErrorHandler.cpp" />
<ClCompile Include="engine\core\ResourceManager.cpp" />
<ClCompile Include="engine\core\Siika2D.cpp" />
<ClCompile Include="engine\graphics\Buffer.cpp" />
<ClCompile Include="engine\graphics\BufferManager.cpp" />
<ClCompile Include="engine\graphics\Camera.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Tegra-Android'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="engine\graphics\GraphicsContext.cpp" />
<ClCompile Include="engine\graphics\Shader.cpp" />
<ClCompile Include="engine\graphics\ShaderManager.cpp" />
<ClCompile Include="engine\graphics\Sprite.cpp" />
<ClCompile Include="engine\graphics\SpriteManager.cpp" />
<ClCompile Include="engine\graphics\Text.cpp" />
<ClCompile Include="engine\graphics\TextManager.cpp" />
<ClCompile Include="engine\graphics\Texture.cpp" />
<ClCompile Include="engine\graphics\TextureManager.cpp" />
<ClCompile Include="engine\misc\Color.cpp" />
<ClCompile Include="engine\misc\GameObject.cpp" />
<ClCompile Include="engine\misc\Input.cpp" />
<ClCompile Include="engine\misc\Timer.cpp" />
<ClCompile Include="engine\misc\TransformComponent.cpp" />
<ClCompile Include="inc\lodepng\lodepng.cpp" />
<ClCompile Include="jni\LevelGenerator.cpp" />
<ClCompile Include="jni\LevelTimer.cpp" />
<ClCompile Include="jni\main.cpp" />
<ClCompile Include="native_app_glue\android_native_app_glue.c" />
<ClCompile Include="Siika_main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="engine\audio\Audio.h" />
<ClInclude Include="engine\audio\AudioInitializer.h" />
<ClInclude Include="engine\audio\AudioManager.h" />
<ClInclude Include="engine\audio\AudioPlayer.h" />
<ClInclude Include="engine\core\ErrorHandler.h" />
<ClInclude Include="engine\core\MemoryManager.h" />
<ClInclude Include="engine\core\ResourceManager.h" />
<ClInclude Include="engine\core\Siika2D.h" />
<ClInclude Include="engine\graphics\Buffer.h" />
<ClInclude Include="engine\graphics\BufferManager.h" />
<ClInclude Include="engine\graphics\Camera.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Tegra-Android'">false</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="engine\graphics\GraphicsContext.h" />
<ClInclude Include="engine\graphics\Shader.h" />
<ClInclude Include="engine\graphics\ShaderManager.h" />
<ClInclude Include="engine\graphics\Shaders.h" />
<ClInclude Include="engine\graphics\Sprite.h" />
<ClInclude Include="engine\graphics\SpriteManager.h" />
<ClInclude Include="engine\graphics\Text.h" />
<ClInclude Include="engine\graphics\TextManager.h" />
<ClInclude Include="engine\graphics\Texture.h" />
<ClInclude Include="engine\graphics\TextureManager.h" />
<ClInclude Include="engine\misc\Color.h" />
<ClInclude Include="engine\misc\Component.h" />
<ClInclude Include="engine\misc\CoordTransform.h" />
<ClInclude Include="engine\misc\GameObject.h" />
<ClInclude Include="engine\misc\Input.h" />
<ClInclude Include="engine\misc\PhysicsComponent.h" />
<ClInclude Include="engine\misc\SpriteComponent.h" />
<ClInclude Include="engine\misc\Timer.h" />
<ClInclude Include="engine\misc\TransformComponent.h" />
<ClInclude Include="inc\lodepng\lodepng.h" />
<ClInclude Include="jni\LevelGenerator.hpp" />
<ClInclude Include="jni\LevelTimer.hpp" />
<ClInclude Include="native_app_glue\android_native_app_glue.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
245 Siika2D/Siika2D/ProjectUpgradeBackup_20151009_1158288668/Siika2D.vcxproj.filters
View file
@@ -0,0 +1,245 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="jni">
<UniqueIdentifier>9083457d-e370-4b32-834c-99709fda3d68</UniqueIdentifier>
</Filter>
<Filter Include="res">
<UniqueIdentifier>eee69b7c-521f-403e-ab42-6e983484441a</UniqueIdentifier>
</Filter>
<Filter Include="res\values">
<UniqueIdentifier>9cddbe70-7b9f-48e4-bfdc-d9d1fad6d41d</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D">
<UniqueIdentifier>{73075b0d-2ff0-4ed8-8fb2-80068dcfab6c}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine">
<UniqueIdentifier>{09c47307-17ea-48ec-9f36-fa3ec5e9dd9e}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine\graphics">
<UniqueIdentifier>{b35dc463-f77e-4c1b-a534-8254223e4901}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine\core">
<UniqueIdentifier>{39a200bd-7c6c-4a80-8470-273e3135321b}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine\misc">
<UniqueIdentifier>{0f991f9a-6779-4e6a-8d50-451fbe124af9}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine\lodepng">
<UniqueIdentifier>{2d11c8a0-ff2a-4907-8f5b-4d1de49f2040}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\native_app_glue">
<UniqueIdentifier>{c546b489-f93e-4094-83d5-3c3fcb1055c8}</UniqueIdentifier>
</Filter>
<Filter Include="Siika2D\engine\audio">
<UniqueIdentifier>{436cfc25-136c-44a2-9f6d-67d8081a93ac}</UniqueIdentifier>
</Filter>
<Filter Include="Ushiko">
<UniqueIdentifier>{ec78f04d-c213-42df-abdb-c232f35c51a8}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<AndroidBuild Include="AndroidManifest.xml" />
<AndroidBuild Include="res\values\strings.xml">
<Filter>res\values</Filter>
</AndroidBuild>
</ItemGroup>
<ItemGroup>
<ClCompile Include="native_app_glue\android_native_app_glue.c">
<Filter>Siika2D\native_app_glue</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Buffer.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\GraphicsContext.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Shader.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\ShaderManager.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Sprite.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Texture.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\TextureManager.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\misc\Color.cpp">
<Filter>Siika2D\engine\misc</Filter>
</ClCompile>
<ClCompile Include="inc\lodepng\lodepng.cpp">
<Filter>Siika2D\engine\lodepng</Filter>
</ClCompile>
<ClCompile Include="engine\core\ErrorHandler.cpp">
<Filter>Siika2D\engine\core</Filter>
</ClCompile>
<ClCompile Include="engine\core\ResourceManager.cpp">
<Filter>Siika2D\engine\core</Filter>
</ClCompile>
<ClCompile Include="jni\main.cpp">
<Filter>Siika2D</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Camera.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\SpriteManager.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\Text.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\misc\Input.cpp">
<Filter>Siika2D\engine\misc</Filter>
</ClCompile>
<ClCompile Include="engine\misc\Timer.cpp">
<Filter>Siika2D\engine\misc</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\BufferManager.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\graphics\TextManager.cpp">
<Filter>Siika2D\engine\graphics</Filter>
</ClCompile>
<ClCompile Include="engine\core\Siika2D.cpp">
<Filter>Siika2D\engine\core</Filter>
</ClCompile>
<ClCompile Include="engine\audio\Audio.cpp">
<Filter>Siika2D\engine\audio</Filter>
</ClCompile>
<ClCompile Include="engine\audio\AudioInitializer.cpp">
<Filter>Siika2D\engine\audio</Filter>
</ClCompile>
<ClCompile Include="engine\audio\AudioManager.cpp">
<Filter>Siika2D\engine\audio</Filter>
</ClCompile>
<ClCompile Include="engine\audio\AudioPlayer.cpp">
<Filter>Siika2D\engine\audio</Filter>
</ClCompile>
<ClCompile Include="Siika_main.cpp">
<Filter>Siika2D\engine</Filter>
</ClCompile>
<ClCompile Include="engine\misc\GameObject.cpp">
<Filter>Siika2D\engine\misc</Filter>
</ClCompile>
<ClCompile Include="engine\misc\TransformComponent.cpp">
<Filter>Siika2D\engine\misc</Filter>
</ClCompile>
<ClCompile Include="jni\LevelGenerator.cpp">
<Filter>Ushiko</Filter>
</ClCompile>
<ClCompile Include="jni\LevelTimer.cpp">
<Filter>Ushiko</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="native_app_glue\android_native_app_glue.h">
<Filter>Siika2D\native_app_glue</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Buffer.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\GraphicsContext.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Shader.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\ShaderManager.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Sprite.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Texture.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\TextureManager.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\misc\Color.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="inc\lodepng\lodepng.h">
<Filter>Siika2D\engine\lodepng</Filter>
</ClInclude>
<ClInclude Include="engine\core\ErrorHandler.h">
<Filter>Siika2D\engine\core</Filter>
</ClInclude>
<ClInclude Include="engine\core\MemoryManager.h">
<Filter>Siika2D\engine\core</Filter>
</ClInclude>
<ClInclude Include="engine\core\ResourceManager.h">
<Filter>Siika2D\engine\core</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Camera.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Shaders.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\SpriteManager.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\Text.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\misc\Component.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\misc\GameObject.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\misc\Input.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\misc\Timer.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\audio\Audio.h">
<Filter>Siika2D\engine\audio</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\BufferManager.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\graphics\TextManager.h">
<Filter>Siika2D\engine\graphics</Filter>
</ClInclude>
<ClInclude Include="engine\core\Siika2D.h">
<Filter>Siika2D\engine\core</Filter>
</ClInclude>
<ClInclude Include="engine\audio\AudioPlayer.h">
<Filter>Siika2D\engine\audio</Filter>
</ClInclude>
<ClInclude Include="engine\audio\AudioInitializer.h">
<Filter>Siika2D\engine\audio</Filter>
</ClInclude>
<ClInclude Include="engine\audio\AudioManager.h">
<Filter>Siika2D\engine\audio</Filter>
</ClInclude>
<ClInclude Include="engine\misc\SpriteComponent.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\misc\TransformComponent.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="jni\LevelGenerator.hpp">
<Filter>Ushiko</Filter>
</ClInclude>
<<<<<<< HEAD
<ClInclude Include="jni\LevelTimer.hpp">
<Filter>Ushiko</Filter>
=======
<ClInclude Include="engine\misc\CoordTransform.h">
<Filter>Siika2D\engine\misc</Filter>
</ClInclude>
<ClInclude Include="engine\misc\PhysicsComponent.h">
<Filter>Siika2D\engine\misc</Filter>
>>>>>>> origin/master
</ClInclude>
</ItemGroup>
</Project>
15 Siika2D/Siika2D/Tegra-Android/Debug/Ant.config.cache
View file
@@ -1,18 +1,17 @@
# GENERATED FILE - DO NOT MODIFY

Configuration=Debug
IsNdkBuildProject=False
SdkRootPath=C:\NVPACK\android-sdk-windows
ToolRootPath=C:\NVPACK\apache-ant-1.8.2
JdkRootPath=C:\NVPACK\jdk1.7.0_45
ToolchainPlugin=android
ToolchainRootPath=C:\NVPACK\android-ndk-r10c
OutputDir=C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\
ProjectRoot=C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\
OutputDir=C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\
ProjectRoot=C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\
ProjectName=Siika2D
BuildTarget=Debug
JavaSourceDir=C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\src
AndroidManifestLocation=C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\AndroidManifest.xml
JavaSourceDir=C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\src
AndroidManifestLocation=C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\AndroidManifest.xml
JarDirectories=
JarDependencies=
NativeLibDirectories=
@@ -33,8 +32,8 @@ AdditionalOptions=
JavaSources:

AndroidBuildSources:
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\AndroidManifest.xml
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\res\values\strings.xml
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\AndroidManifest.xml
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\res\values\strings.xml

Sources:
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Tegra-Android\Debug\libSiika2D.so
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Tegra-Android\Debug\libSiika2D.so
4 Siika2D/Siika2D/Tegra-Android/Debug/bin/AndroidManifest.xml
View file
@@ -6,7 +6,7 @@
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />

<!-- This .apk has no Java code itself, so set hasCode to false. -->
<application android:label="@string/app_name" android:hasCode="False" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:debuggable="true">
<application android:label="@string/app_name" android:hasCode="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:debuggable="true">
<!-- Our activity is the built-in NativeActivity framework class.
This will take care of integrating with our NDK code. -->
<activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize">
@@ -18,7 +18,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<activity android:name="com.nvidia.pentak.LaunchProxy" android:noHistory="true"><intent-filter><action android:name="android.intent.action.MAIN" /></intent-filter></activity></application>

</manifest>
<!-- END_INCLUDE(manifest) -->
4 Siika2D/Siika2D/Tegra-Android/Debug/bin/AndroidManifest.xml.d
View file
@@ -1,2 +1,2 @@
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\AndroidManifest.xml : \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\AndroidManifest.xml : \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml \
9 Siika2D/Siika2D/Tegra-Android/Debug/bin/Siika2D-debug-unaligned.apk.d
View file
@@ -1,4 +1,5 @@
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D-debug-unaligned.apk : \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D.ap_ \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs\armeabi-v7a\gdbserver \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs\armeabi-v7a\libSiika2D.so \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D-debug-unaligned.apk : \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D.ap_ \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes.dex \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs\armeabi-v7a\gdbserver \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs\armeabi-v7a\libSiika2D.so \
44 Siika2D/Siika2D/Tegra-Android/Debug/bin/Siika2D.ap_.d
View file
@@ -1,22 +1,22 @@
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D.ap_ \
: C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\res\values\strings.xml \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\2kg_siika.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\arial.ttf \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\bg_fragmentShader.glsl \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\bg_vertexShader.glsl \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\ding.wav \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\erg.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\fragmentTextShader.glsl \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\siika.ogg \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\siika.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\Siika2D_background.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\tekstuuri.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\testi_siika.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\testi_Siika2D_background.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\testi_tekstuuri.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\tile_grass_left_corner.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\tile_grass_middle.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\tile_grass_right_corner.png \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\vertexTextShader.glsl \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\assets\wilhelm_scream.ogg \
C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\AndroidManifest.xml \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\Siika2D.ap_ \
: C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\res\values\strings.xml \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\2kg_siika.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\arial.ttf \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\bg_fragmentShader.glsl \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\bg_vertexShader.glsl \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\ding.wav \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\erg.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\fragmentTextShader.glsl \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\siika.ogg \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\siika.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\Siika2D_background.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\tekstuuri.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\testi_siika.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\testi_Siika2D_background.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\testi_tekstuuri.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\tile_grass_left_corner.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\tile_grass_middle.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\tile_grass_right_corner.png \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\vertexTextShader.glsl \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\assets\wilhelm_scream.ogg \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\AndroidManifest.xml \
BIN +2.21 KB Siika2D/Siika2D/Tegra-Android/Debug/bin/classes.dex
View file
Binary file not shown.
6 Siika2D/Siika2D/Tegra-Android/Debug/bin/classes.dex.d
View file
@@ -0,0 +1,6 @@
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes.dex : \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes\com\nvidia\pentak\LaunchProxy.class \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes\com\siika2D\BuildConfig.class \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes\com\siika2D\R$attr.class \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes\com\siika2D\R$string.class \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\classes\com\siika2D\R.class \
BIN +1.17 KB Siika2D/Siika2D/Tegra-Android/Debug/bin/classes/com/nvidia/pentak/LaunchProxy.class
View file
Binary file not shown.
BIN +331 Bytes Siika2D/Siika2D/Tegra-Android/Debug/bin/classes/com/siika2D/BuildConfig.class
View file
Binary file not shown.
BIN +319 Bytes Siika2D/Siika2D/Tegra-Android/Debug/bin/classes/com/siika2D/R$attr.class
View file
Binary file not shown.
BIN +377 Bytes Siika2D/Siika2D/Tegra-Android/Debug/bin/classes/com/siika2D/R$string.class
View file
Binary file not shown.
BIN +361 Bytes Siika2D/Siika2D/Tegra-Android/Debug/bin/classes/com/siika2D/R.class
View file
Binary file not shown.
6 Siika2D/Siika2D/Tegra-Android/Debug/bin/proguard.txt
View file
@@ -0,0 +1,6 @@
# view AndroidManifest.xml #generated:12
-keep class android.app.NativeActivity { <init>(...); }

# view AndroidManifest.xml #generated:21
-keep class com.nvidia.pentak.LaunchProxy { <init>(...); }

3 Siika2D/Siika2D/Tegra-Android/Debug/gen/R.java.d
View file
@@ -0,0 +1,3 @@
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\gen\com\siika2D\R.java \
: C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\res\values\strings.xml \
C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin\AndroidManifest.xml \
6 Siika2D/Siika2D/Tegra-Android/Debug/gen/com/siika2D/BuildConfig.java
View file
@@ -0,0 +1,6 @@
/** Automatically generated file. DO NOT MODIFY */
package com.siika2D;

public final class BuildConfig {
public final static boolean DEBUG = true;
}
16 Siika2D/Siika2D/Tegra-Android/Debug/gen/com/siika2D/R.java
View file
@@ -0,0 +1,16 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/

package com.siika2D;

public final class R {
public static final class attr {
}
public static final class string {
public static final int app_name=0x7f020000;
}
}
BIN +0 Bytes (100%) Siika2D/Siika2D/Tegra-Android/Debug/libs/armeabi-v7a/libSiika2D.so
View file
Binary file not shown.
22 Siika2D/Siika2D/Tegra-Android/Debug/nsight_tegra_build.xml
View file
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="Siika2D" basedir="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\">
<project name="Siika2D" basedir="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\">
<!--Users should specify these files if they need to override the Nsight Tegra generated properties in this document generated from Visual Studio properties.-->
<import file="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\nsight_tegra_build_overrides_debug.xml" optional="true" />
<import file="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\nsight_tegra_build_overrides.xml" optional="true" />
<import file="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\nsight_tegra_build_overrides_debug.xml" optional="true" />
<import file="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\nsight_tegra_build_overrides.xml" optional="true" />
<!--REGION-BEGIN: The following properties prevents Nsight Tegra from needing to modify user property files. Setting them here will ensure they always match Visual Studio and allows users to build without needing to check out version controlled files.-->
<property name="sdk.dir" value="C:\NVPACK\android-sdk-windows" />
<property name="source.dir" value="" />
<property name="source.dir" value="C:\\Users\\JereOik\\Documents\\GitHub\\Ushiko\\Siika2D\\Siika2D\\Tegra-Android\\Debug\\src" />
<property name="target" value="android-16" />
<!--REGION-END-->
<!--REGION-BEGIN: The following properties prevents Nsight Tegra from needing to modify user manifest files. Setting them here will ensure they always match Visual Studio and allows users to build without needing to check out version controlled files.-->
<property name="manifest.file" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml" />
<property name="manifest.abs.file" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml" />
<property name="manifest.file" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml" />
<property name="manifest.abs.file" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\nsight_tegra_manifest.xml" />
<!--REGION-END-->
<!--REGION-BEGIN: The following properties allow Nsight Tegra to maintain build results per-configuration (debug, release, etc).-->
<property name="gen.absolute.dir" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\gen" />
<property name="out.dir" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin" />
<property name="jar.libs.dir" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs" />
<property name="native.libs.absolute.dir" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs" />
<property name="gen.absolute.dir" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\gen" />
<property name="out.dir" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\bin" />
<property name="jar.libs.dir" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs" />
<property name="native.libs.absolute.dir" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\libs" />
<target name="-pre-compile">
<property name="nsight.tegra.project.all.jars.path" value="${toString:project.all.jars.path}" />
<path id="project.all.jars.path">
@@ -26,7 +26,7 @@
</fileset>
</path>
</target>
<property name="XmlLogger.file" value="C:\Users\JarnoLaa\Desktop\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\ant_log.xml" />
<property name="XmlLogger.file" value="C:\Users\JereOik\Documents\GitHub\Ushiko\Siika2D\Siika2D\Tegra-Android\Debug\ant_log.xml" />
<!--REGION-END-->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>
4 Siika2D/Siika2D/Tegra-Android/Debug/nsight_tegra_manifest.xml
View file
@@ -6,7 +6,7 @@
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />

<!-- This .apk has no Java code itself, so set hasCode to false. -->
<application android:label="@string/app_name" android:hasCode="False" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:debuggable="true">
<application android:label="@string/app_name" android:hasCode="true" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:debuggable="true">
<!-- Our activity is the built-in NativeActivity framework class.
This will take care of integrating with our NDK code. -->
<activity android:name="android.app.NativeActivity" android:label="@string/app_name" android:screenOrientation="landscape" android:configChanges="orientation|keyboardHidden|screenSize">
@@ -18,7 +18,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<activity android:name="com.nvidia.pentak.LaunchProxy" android:noHistory="true"><intent-filter><action android:name="android.intent.action.MAIN" /></intent-filter></activity></application>

</manifest>
<!-- END_INCLUDE(manifest) -->
387 ...a2D/Siika2D/inc/Box2D/Build/vs2013/ProjectUpgradeBackup_20151009_1158288628/Box2D.vcxproj
View file

Large diffs are not rendered by default.

298 ...a2D/inc/Box2D/Build/vs2013/ProjectUpgradeBackup_20151009_1158288698/Box2D.vcxproj.filters
View file
@@ -0,0 +1,298 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Collision">
<UniqueIdentifier>{EE06093C-52B3-9A42-A586-8CCC65597D57}</UniqueIdentifier>
</Filter>
<Filter Include="Collision\Shapes">
<UniqueIdentifier>{4A368771-7ADC-A143-B42F-58CB8448EA17}</UniqueIdentifier>
</Filter>
<Filter Include="Common">
<UniqueIdentifier>{17132958-D902-9D46-A032-A2DD9E3FAED5}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics">
<UniqueIdentifier>{C815CFE9-147A-D443-8BB0-31FC775E62F4}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Contacts">
<UniqueIdentifier>{BE9A720A-8AF8-9C4C-A4FE-3F2BACAF8A59}</UniqueIdentifier>
</Filter>
<Filter Include="Dynamics\Joints">
<UniqueIdentifier>{CFBD1F37-CEEA-CA41-9715-5C0ACDD84298}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Box2D\Box2D.h" />
<ClInclude Include="..\..\Box2D\Collision\b2BroadPhase.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\b2Collision.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\b2Distance.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\b2DynamicTree.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\b2TimeOfImpact.h">
<Filter>Collision</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\Shapes\b2ChainShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\Shapes\b2CircleShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\Shapes\b2EdgeShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\Shapes\b2PolygonShape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Collision\Shapes\b2Shape.h">
<Filter>Collision\Shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2BlockAllocator.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2Draw.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2GrowableStack.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2Math.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2Settings.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2StackAllocator.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Common\b2Timer.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2Body.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2ContactManager.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2Fixture.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2Island.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2TimeStep.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2World.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\b2WorldCallbacks.h">
<Filter>Dynamics</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2CircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2Contact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2ContactSolver.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Contacts\b2PolygonContact.h">
<Filter>Dynamics\Contacts</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2DistanceJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2FrictionJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2GearJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2Joint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2MouseJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2PrismaticJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2PulleyJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2RevoluteJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2RopeJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2WeldJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2WheelJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
<ClInclude Include="..\..\Box2D\Dynamics\Joints\b2MotorJoint.h">
<Filter>Dynamics\Joints</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\Box2D\Collision\b2BroadPhase.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2CollideCircle.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2CollideEdge.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2CollidePolygon.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2Collision.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2Distance.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2DynamicTree.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\b2TimeOfImpact.cpp">
<Filter>Collision</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\Shapes\b2ChainShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\Shapes\b2CircleShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\Shapes\b2EdgeShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Collision\Shapes\b2PolygonShape.cpp">
<Filter>Collision\Shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2BlockAllocator.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2Draw.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2Math.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2Settings.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2StackAllocator.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Common\b2Timer.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2Body.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2ContactManager.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2Fixture.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2Island.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2World.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\b2WorldCallbacks.cpp">
<Filter>Dynamics</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2ChainAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2ChainAndPolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2CircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2Contact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2ContactSolver.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2EdgeAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2EdgeAndPolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2PolygonAndCircleContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Contacts\b2PolygonContact.cpp">
<Filter>Dynamics\Contacts</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2DistanceJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2FrictionJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2GearJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2Joint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2MouseJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2PrismaticJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2PulleyJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2RevoluteJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2RopeJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2WeldJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2WheelJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
<ClCompile Include="..\..\Box2D\Dynamics\Joints\b2MotorJoint.cpp">
<Filter>Dynamics\Joints</Filter>
</ClCompile>
</ItemGroup>
</Project>
906 Siika2D/Siika2D/inc/freetype/ProjectUpgradeBackup_20151009_1158288598/freetype.vcxproj
View file

Large diffs are not rendered by default.

155 ...2D/Siika2D/inc/freetype/ProjectUpgradeBackup_20151009_1158288678/freetype.vcxproj.filters
View file
@@ -0,0 +1,155 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{b4c15893-ec11-491d-9507-0ac184f9cc78}</UniqueIdentifier>
<Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Source Files\FT_MODULES">
<UniqueIdentifier>{4d3e4eff-3fbc-4b20-b413-2743b23b7109}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{e6cf6a0f-0404-4024-8bf8-ff5b29f35657}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\base\ftdebug.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\autofit\autofit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\bdf\bdf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\cff\cff.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftbase.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftbitmap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\cache\ftcache.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftfstype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftgasp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftglyph.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\gzip\ftgzip.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftinit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\lzw\ftlzw.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftstroke.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftsystem.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\smooth\smooth.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftbbox.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftmm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftpfr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftsynth.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\fttype1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftwinfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftxf86.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftlcdfil.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftgxval.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftotval.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\base\ftpatent.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\pcf\pcf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\pfr\pfr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\psaux\psaux.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\pshinter\pshinter.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\psnames\psmodule.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\raster\raster.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\sfnt\sfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\truetype\truetype.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\type1\type1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\cid\type1cid.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\type42\type42.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\winfonts\winfnt.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\ft2build.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\config\ftconfig.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\config\ftheader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\config\ftmodule.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\config\ftoption.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\config\ftstdlib.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
11 Siika2D/Siika2D/jni/main.cpp
View file
@@ -27,15 +27,10 @@ void siika_init()

siika->_graphicsContext->setClearColor(graphics::Color(0, 255, 255, 255));

<<<<<<< HEAD
lt = new LevelTimer;
lt->InitTimer(siika, "arial.ttf", 64, 0.5, -0.95);

lg = new LevelGenerator;
lg->initSprites(siika, "tile_grass_left_corner.png", "tile_grass_middle.png", "tile_grass_right_corner.png");
=======
lg = new LevelGenerator(siika);
>>>>>>> origin/master
}

void siika_main()
@@ -50,12 +45,10 @@ void siika_main()
ushiko.getComponent<misc::TransformComponent>()->setPosition(position);
ushiko.update();

<<<<<<< HEAD
lg->update();
lg->update(siika);
lt->update();
=======

lg->update(siika);
>>>>>>> origin/master

siika->_spriteManager->drawSprites();
siika->_textManager->drawTexts();
BIN +360 Bytes (100%) Siika2D/Tegra-Android/Debug/libBox2D.a
View file
Binary file not shown.
BIN +5.41 KB (100%) Siika2D/Tegra-Android/Debug/libSiika2D.so
View file
Binary file not shown.
BIN +312 Bytes (100%) Siika2D/Tegra-Android/Debug/libfreetype.a
View file
Binary file not shown.
BIN +0 Bytes (100%) Siika2D/Tegra-Android/Debug/stripped_libSiika2D.so
View file
Binary file not shown.