Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Android-trash' since it is no longer quite so trashy.
- Loading branch information
Showing
52 changed files
with
4,185 additions
and
146 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="gen"/> | ||
| <classpathentry kind="output" path="bin/classes"/> | ||
| </classpath> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| gen | ||
| obj | ||
| #ui_atlas.zim | ||
| ui_atlas.zim.png | ||
| #assets/ui_atlas.zim | ||
| #jni/ui_atlas.cpp | ||
| #jni/ui_atlas.h |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>ppsspp</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ApkBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>com.android.ide.eclipse.adt.AndroidNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 | ||
| org.eclipse.jdt.core.compiler.compliance=1.5 | ||
| org.eclipse.jdt.core.compiler.source=1.5 |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="org.dolphinemu.dolphinemu" | ||
| android:versionCode="1" | ||
| android:versionName="0.1" > | ||
|
|
||
| <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/> | ||
|
|
||
| <uses-feature android:glEsVersion="0x00020000"></uses-feature> | ||
| <uses-feature android:name="android.hardware.screen.landscape" /> | ||
| <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> | ||
| <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> | ||
|
|
||
| <application | ||
| android:icon="@drawable/launcher" | ||
| android:label="@string/app_name"> | ||
| <activity | ||
| android:name=".DolphinEmulator" | ||
| android:label="@string/app_name" | ||
| android:theme="@android:style/Theme.NoTitleBar.Fullscreen" | ||
| android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" > | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <activity | ||
| android:name=".NativeListView" | ||
| android:label="@string/app_name" | ||
| android:theme="@android:style/Theme" | ||
| android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" > | ||
| </activity> | ||
| </application> | ||
|
|
||
| </manifest> |
Oops, something went wrong.