Merge remote-tracking branch 'refs/remotes/project64/master'

.gitignore

@@ -5,6 +5,11 @@
 *.suo
 *.user
 *.opendb
+*.VC.db
+
+# static library output (MSVC, GCC--from core components like Common)
+*.lib
+*.a
 
 # compiler-generated sources (MSVC, GCC)
 *.asm
@@ -26,6 +31,8 @@ Thumbs.db
 /Config/Project64.sc3
 /Config/Project64.zcache
 /ipch
+/Plugin/Audio/AndroidAudio.dll
+/Plugin/Audio/AndroidAudio_d.dll
 /Plugin/GFX/lib
 /Plugin/GFX/map
 /Plugin/GFX/pdb
@@ -34,6 +41,8 @@ Thumbs.db
 /Plugin/Input/lib
 /Plugin/Input/map
 /Plugin/Input/pdb
+/Plugin/Input/AndroidInput.dll
+/Plugin/Input/AndroidInput_d.dll
 /Plugin/Input/PJ64_NRage.dll
 /Plugin/Input/PJ64_NRage_d.dll
 /Plugin/RSP/lib
@@ -41,6 +50,11 @@ Thumbs.db
 /Plugin/RSP/pdb
 /Plugin/RSP/RSP 1.7.dll
 /Plugin/RSP/RSP_d 1.7.dll
+/Plugin/RSP/RSP-HLE.dll
+/Plugin/RSP/RSP-HLE_d.dll
+/Plugin64/AndroidAudio
+/Plugin64/Audio/AndroidAudio.dll
+/Plugin64/Audio/AndroidAudio_d.dll
 /Plugin64/GFX/lib
 /Plugin64/GFX/map
 /Plugin64/GFX/pdb
@@ -49,6 +63,8 @@ Thumbs.db
 /Plugin64/Input/lib
 /Plugin64/Input/map
 /Plugin64/Input/pdb
+/Plugin64/Input/AndroidInput.dll
+/Plugin64/Input/AndroidInput_d.dll
 /Plugin64/Input/PJ64_NRage.dll
 /Plugin64/Input/PJ64_NRage_d.dll
 /Plugin64/RSP/lib
@@ -56,6 +72,8 @@ Thumbs.db
 /Plugin64/RSP/pdb
 /Plugin64/RSP/RSP 1.7.dll
 /Plugin64/RSP/RSP_d 1.7.dll
+/Plugin64/RSP/RSP-HLE.dll
+/Plugin64/RSP/RSP-HLE_d.dll
 /Source/3rdParty/wx/lib/vc_lib/msw/wx/setup.h
 /Source/3rdParty/wx/lib/vc_lib/mswd/wx/setup.h
 /Source/3rdParty/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h

Android/.externalToolBuilders/Build Assets.launch

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/Project64/assets&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Project64"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Project64/buildAssets.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Project64}"/>
+</launchConfiguration>

Android/.externalToolBuilders/Copy Project64 C++ Source.launch

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/Project64/jni&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Project64"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/Project64&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Project64/copySource.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Project64}"/>
+</launchConfiguration>

Android/.gitignore

@@ -0,0 +1,15 @@
+# Generated and temporary files
+assets/project64_data/Config
+assets/project64_data/Lang
+bin/
+gen/
+obj/
+*.d
+*.o
+*.so
+# Eclipse project files
+.settings/
+.classpath
+.cproject
+.project
+

Android/.project.init

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Project64</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>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>clean,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Copy Project64 C++ Source.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>clean,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Build Assets.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Android/AndroidManifest.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64" android:versionCode="4" android:versionName="2.3.1" >
+    
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+    
+	<uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+
+    <application
+        android:name="emu.project64.Project64Application"
+        android:allowBackup="true"
+        android:isGame="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Project64" >
+        <activity
+            android:name="emu.project64.SplashActivity"
+            android:label="@string/SplashActivity_title"
+            android:theme="@style/Theme.Project64.Splash"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="tv.ouya.intent.category.GAME" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="emu.project64.GalleryActivity"
+            android:exported="false"
+            android:label="@string/GalleryActivity_title"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Project64.Apearance" >
+        </activity>
+        <activity
+            android:name="emu.project64.ScanRomsActivity"
+            android:exported="false"
+            android:label="@string/ScanRomsActivity_title"
+            android:theme="@style/Theme.AppCompat" >
+        </activity>
+        <activity
+            android:name="emu.project64.profile.ControllerProfileActivity"
+            android:exported="false"
+            android:label="@string/ControllerProfileActivity_title"
+            android:theme="@style/Theme.Project64.Apearance" >
+            <intent-filter>
+                <action android:name=".profile.ControllerProfileActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <!--
+        For the GameActivities, do not restart the activity when the phone's slider
+        opens or closes, or when the orientation (and thereby screen size) changes.
+        This behavior is specified in android:configChanges below.
+        -->
+        <activity
+            android:name="emu.project64.game.GameActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/GameActivity_title"
+            android:theme="@style/Theme.Project64.GameActivity" >
+        </activity>
+        <activity
+            android:name="emu.project64.game.GameActivityXperiaPlay"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/GameActivity_title"
+            android:theme="@style/Theme.Project64.GameActivity" >
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="xperia-touchpad" />
+        </activity>
+        <activity
+            android:name="emu.project64.AboutActivity"
+            android:theme="@style/Theme.Project64.About" />
+         <activity
+            android:name="emu.project64.settings.SettingsActivity"
+            android:theme="@style/Theme.Project64.Apearance" />
+         <activity
+            android:name="emu.project64.settings.GameSettingsActivity"
+            android:theme="@style/Theme.Project64.Apearance" />
+     </application>
+</manifest>

Android/Script/build.cmd

@@ -0,0 +1,61 @@
+@ECHO OFF
+SETLOCAL
+
+set origdir=%cd%
+cd /d %~dp0..\..\
+set base_dir=%cd%
+cd /d %origdir%
+
+set VersionName=
+if not "%1" == "" set VersionName= %1
+
+set NDK-BUILDER=
+if exist "C:\Android\android-ndk-r11c\ndk-build.cmd" ( set NDK-BUILDER="C:\Android\android-ndk-r11c\ndk-build.cmd" )
+if %NDK-BUILDER% == "" ( 
+	echo can not find android NDK
+	goto :EndErr
+)
+
+set ANDROID_SDK=
+if exist "C:\Android\android-sdk" ( set ANDROID_SDK="C:\Android\android-sdk" )
+if %NDK-BUILDER% == "" ( 
+	echo can not find android SDK
+	goto :EndErr
+)
+
+call "%base_dir%\Android\Script\buildAssets.cmd"
+IF %ERRORLEVEL% NEQ 0 goto :EndErr
+
+call "%base_dir%\Android\Script\copySource.cmd"
+IF %ERRORLEVEL% NEQ 0 goto :EndErr
+
+cd /d %base_dir%\Android
+call %NDK-BUILDER% clean
+IF %ERRORLEVEL% NEQ 0 goto :EndErr
+call %NDK-BUILDER%
+IF %ERRORLEVEL% NEQ 0 goto :EndErr
+call ant clean release -Dsdk.dir=%ANDROID_SDK%
+IF %ERRORLEVEL% NEQ 0 goto :EndErr
+cd /d %origdir%
+
+:: Make sure the sign environment variables exist
+IF NOT DEFINED project64_cert_keystore ( exit /B 0 )
+IF NOT DEFINED project64_cert_password ( exit /B 0 )
+
+:: Sign the APK
+jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -tsa http://timestamp.digicert.com -keystore "%project64_cert_keystore%" -storepass %project64_cert_password% -keypass %project64_cert_password% "%base_dir%\Android\bin\Project64-release-unsigned.apk" project64
+
+:: Align the APK
+zipalign -v 4 "%base_dir%\Android\bin\Project64-release-unsigned.apk" "%base_dir%\Package\Project64%VersionName%.apk"
+
+echo Build ok
+goto :end
+
+:EndErr
+ENDLOCAL
+echo Build failed
+exit /B 1
+
+:End
+ENDLOCAL
+exit /B 0

Android/Script/buildAssets.cmd

@@ -0,0 +1,32 @@
+@ECHO OFF
+SETLOCAL
+
+set origdir=%cd%
+cd /d %~dp0..\..\
+set base_dir=%cd%
+
+cd /d %origdir%
+
+echo Building Lang files
+xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/project64_data/Lang/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo Copy config files
+IF NOT EXIST "%base_dir%/Android/assets/project64_data/Config/" mkdir "%base_dir%/Android/assets/project64_data/Config/"
+copy "%base_dir%\Config\Glide64.rdb" "%base_dir%\Android\assets\project64_data\Config\"
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+copy "%base_dir%\Config\Project64.cht" "%base_dir%\Android\assets\project64_data\Config\"
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Android\assets\project64_data\Config\"
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\project64_data\Config\"
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+goto :end
+
+:End
+ENDLOCAL
+exit /B 0

Android/Script/copySource.cmd

@@ -0,0 +1,63 @@
+@ECHO OFF
+SETLOCAL
+
+set origdir=%cd%
+cd /d %~dp0..\..\
+set base_dir=%cd%
+
+cd /d %origdir%
+
+echo copy 3rdParty/7zip
+xcopy "%base_dir%/Source/3rdParty/7zip" "%base_dir%/Android/jni/3rdParty/7zip/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy 3rdParty/png
+xcopy "%base_dir%/Source/3rdParty/png" "%base_dir%/Android/jni/3rdParty/png/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy 3rdParty/zlib
+xcopy "%base_dir%/Source/3rdParty/zlib" "%base_dir%/Android/jni/3rdParty/zlib/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Common
+xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Glide64
+xcopy "%base_dir%/Source/Glide64" "%base_dir%/Android/jni/Glide64/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy GlideHQ
+xcopy "%base_dir%/Source/GlideHQ" "%base_dir%/Android/jni/GlideHQ/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Glitch64
+xcopy "%base_dir%/Source/Glitch64" "%base_dir%/Android/jni/Glitch64/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy PluginAudio
+xcopy "%base_dir%/Source/Android/PluginAudio" "%base_dir%/Android/jni/PluginAudio/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy PluginInput
+xcopy "%base_dir%/Source/Android/PluginInput" "%base_dir%/Android/jni/PluginInput/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy PluginRSP
+xcopy "%base_dir%/Source/Android/PluginRSP" "%base_dir%/Android/jni/PluginRSP/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Project64-bridge
+xcopy "%base_dir%/Source/Android/Bridge" "%base_dir%/Android/jni/Project64-bridge/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Project64-core
+xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+echo copy Settings
+xcopy "%base_dir%/Source/Settings" "%base_dir%/Android/jni/Settings/" /D /I /F /Y /E
+IF %ERRORLEVEL% NEQ 0 (exit /B 1)
+
+ENDLOCAL
+exit /B 0

Android/assets/licence.htm

@@ -0,0 +1,412 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+
+<head>
+    <title>Project64 for Android licenses</title>
+    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+</head>
+
+<body id="top" style="background-color: #EBEBEE">
+    <h1>Project64 for Android</h1>
+    <p>Copyleft &copy; 1998-2016 Project64, Project64 authors</p>
+    <div>
+      <h2>License</h2>
+        <p>Project64 for Android is licensed under the <a href="#gpl">GNU General Public License, version 2 or later</a> (herein referred to as GPL).</p>
+      <h2>Sources</h2>
+        <p>The sources to this application can be retrieved at <a href="https://github.com/project64/project64">https://github.com/project64/project64</a>.</p>
+      <hr />
+         <div>
+<h3><a id="SEC1">GNU GENERAL PUBLIC LICENSE</a></h3>
+<p>
+Version 2, June 1991
+</p>
+
+<pre>
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+</pre>
+
+<h3><a id="preamble"></a><a id="SEC2">Preamble</a></h3>
+
+<p>
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+</p>
+
+<p>
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+</p>
+
+<p>
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+</p>
+
+<p>
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+</p>
+
+<p>
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+</p>
+
+<p>
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+</p>
+
+<p>
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+</p>
+
+<p>
+  The precise terms and conditions for copying, distribution and
+modification follow.
+</p>
+
+
+<h3><a id="terms"></a><a id="SEC3">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</a></h3>
+
+
+<a id="section0"></a><p>
+<strong>0.</strong>
+ This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+</p>
+
+<p>
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+</p>
+
+<a id="section1"></a><p>
+<strong>1.</strong>
+ You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+</p>
+
+<p>
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+</p>
+
+<a id="section2"></a><p>
+<strong>2.</strong>
+ You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p>
+
+<dl>
+  <dt></dt>
+    <dd>
+      <strong>a)</strong>
+      You must cause the modified files to carry prominent notices
+      stating that you changed the files and the date of any change.
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>b)</strong>
+      You must cause any work that you distribute or publish, that in
+      whole or in part contains or is derived from the Program or any
+      part thereof, to be licensed as a whole at no charge to all third
+      parties under the terms of this License.
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>c)</strong>
+      If the modified program normally reads commands interactively
+      when run, you must cause it, when started running for such
+      interactive use in the most ordinary way, to print or display an
+      announcement including an appropriate copyright notice and a
+      notice that there is no warranty (or else, saying that you provide
+      a warranty) and that users may redistribute the program under
+      these conditions, and telling the user how to view a copy of this
+      License.  (Exception: if the Program itself is interactive but
+      does not normally print such an announcement, your work based on
+      the Program is not required to print an announcement.)
+    </dd>
+</dl>
+
+<p>
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+</p>
+
+<p>
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+</p>
+
+<p>
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p>
+
+<a id="section3"></a><p>
+<strong>3.</strong>
+ You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+</p>
+
+<!-- we use this doubled UL to get the sub-sections indented, -->
+<!-- while making the bullets as unobvious as possible. -->
+
+<dl>
+  <dt></dt>
+    <dd>
+      <strong>a)</strong>
+      Accompany it with the complete corresponding machine-readable
+      source code, which must be distributed under the terms of Sections
+      1 and 2 above on a medium customarily used for software interchange; or,
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>b)</strong>
+      Accompany it with a written offer, valid for at least three
+      years, to give any third party, for a charge no more than your
+      cost of physically performing source distribution, a complete
+      machine-readable copy of the corresponding source code, to be
+      distributed under the terms of Sections 1 and 2 above on a medium
+      customarily used for software interchange; or,
+    </dd>
+  <dt></dt>
+    <dd>
+      <strong>c)</strong>
+      Accompany it with the information you received as to the offer
+      to distribute corresponding source code.  (This alternative is
+      allowed only for noncommercial distribution and only if you
+      received the program in object code or executable form with such
+      an offer, in accord with Subsection b above.)
+    </dd>
+</dl>
+
+<p>
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+</p>
+
+<p>
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p>
+
+<a id="section4"></a><p>
+<strong>4.</strong>
+ You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+</p>
+
+<a id="section5"></a><p>
+<strong>5.</strong>
+ You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+</p>
+
+<a id="section6"></a><p>
+<strong>6.</strong>
+ Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+</p>
+
+<a id="section7"></a><p>
+<strong>7.</strong>
+ If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+</p>
+
+<p>
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+</p>
+
+<p>
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+</p>
+
+<p>
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p>
+
+<a id="section8"></a><p>
+<strong>8.</strong>
+ If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+</p>
+
+<a id="section9"></a><p>
+<strong>9.</strong>
+ The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+</p>
+
+<p>
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+</p>
+
+<a id="section10"></a><p>
+<strong>10.</strong>
+ If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+</p>
+
+<a id="section11"></a><p><strong>NO WARRANTY</strong></p>
+
+<p>
+<strong>11.</strong>
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+</p>
+
+<a id="section12"></a><p>
+<strong>12.</strong>
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+</p>
+
+<p><a href="#top">Back to the top</a></p>
+</body>
+
+</html>

Android/assets/project64_data/profiles/touchscreen.cfg

@@ -0,0 +1,57 @@
+[Analog]
+comment=All controls except D-pad and L-button
+analog-x=0
+analog-y=100
+analog-min=1
+analog-max=55
+analog-buff=55
+groupAB-x=100
+groupAB-y=100
+groupC-x=100
+groupC-y=50
+buttonR-x=95
+buttonR-y=0
+buttonZ-x=0
+buttonZ-y=0
+buttonS-x=50
+buttonS-y=0
+
+[Digital]
+comment=All controls except analog stick and Z-trigger
+dpad-x=0
+dpad-y=100
+groupAB-x=100
+groupAB-y=100
+groupC-x=100
+groupC-y=50
+buttonL-x=0
+buttonL-y=0
+buttonR-x=95
+buttonR-y=0
+buttonS-x=50
+buttonS-y=0
+
+[Everything]
+comment=All controls
+analog-x=0
+analog-y=100
+analog-min=1
+analog-max=55
+analog-buff=55
+dpad-x=0
+dpad-y=20
+groupAB-x=100
+groupAB-y=100
+groupC-x=100
+groupC-y=50
+buttonL-x=0
+buttonL-y=0
+buttonR-x=95
+buttonR-y=0
+buttonZ-x=0
+buttonZ-y=58
+buttonS-x=50
+buttonS-y=0
+
+[Nothing]
+comment=Do not show touchscreen controls

Android/assets/project64_data/skins/touchscreen/Outline/skin.ini

@@ -0,0 +1,27 @@
+[INFO]
+name=Outline
+referenceScreenWidth=1280
+referenceScreenHeight=720
+fps-numx=27
+fps-numy=50
+fps-minPixels=75
+
+[MASK_COLOR]
+Du=FF0000
+Dru=FFFC00
+Dr=00FFF0
+Drd=FF9600
+Dd=CC00FF
+Dld=A000FF
+Dl=D62D4D
+Dlu=00FF5A
+Cu=00E0CA
+Cr=FF635C
+Cd=84A1D5
+Cl=5A6B1F
+A=007F46
+B=4B4B4B
+L=FFB400
+R=6B1F49
+Z=42A6EC
+S=B45D5D

Android/assets/project64_data/skins/touchscreen/Shaded/skin.ini

@@ -0,0 +1,27 @@
+[INFO]
+name=Shaded
+referenceScreenWidth=1280
+referenceScreenHeight=720
+fps-numx=27
+fps-numy=50
+fps-minPixels=75
+
+[MASK_COLOR]
+Du=FF0000
+Dru=FFFC00
+Dr=00FFF0
+Drd=FF9600
+Dd=CC00FF
+Dld=A000FF
+Dl=D62D4D
+Dlu=00FF5A
+Cu=00E0CA
+Cr=FF635C
+Cd=84A1D5
+Cl=5A6B1F
+A=007F46
+B=4B4B4B
+L=FFB400
+R=6B1F49
+Z=42A6EC
+S=B45D5D

Android/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Project64" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>

Android/buildAssets.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Create Assets" default="Create Assets" basedir="."> 
+	<target name="Create Assets">
+		<copy todir="./assets/project64_data/Lang/">
+		    <fileset dir="../Lang"/>
+		</copy>
+		<copy file="../Config/Glide64.rdb" todir="./assets/project64_data/Config"/>
+		<copy file="../Config/Project64.cht" todir="./assets/project64_data/Config"/>
+		<copy file="../Config/Project64.rdb" todir="./assets/project64_data/Config"/>
+		<copy file="../Config/Project64.rdx" todir="./assets/project64_data/Config"/>
+	</target>
+</project>

Android/copySource.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Copy C++ Source" default="Copy C++ Source" basedir="."> 
+	<target name="Copy C++ Source">
+		<copy todir="./jni/3rdParty/7zip/">
+		    <fileset dir="../Source/3rdParty/7zip"/>
+		</copy>
+		<copy todir="./jni/3rdParty/png/">
+		    <fileset dir="../Source/3rdParty/png"/>
+		</copy>
+		<copy todir="./jni/3rdParty/zlib/">
+		    <fileset dir="../Source/3rdParty/zlib"/>
+		</copy>
+		<copy todir="./jni/Common/">
+		    <fileset dir="../Source/Common"/>
+		</copy>
+		<copy todir="./jni/Glide64/">
+		    <fileset dir="../Source/Glide64"/>
+		</copy>
+		<copy todir="./jni/GlideHQ/">
+		    <fileset dir="../Source/GlideHQ"/>
+		</copy>
+		<copy todir="./jni/Glitch64/">
+		    <fileset dir="../Source/Glitch64"/>
+		</copy>
+		<copy todir="./jni/PluginAudio/">
+		    <fileset dir="../Source/Android/PluginAudio"/>
+		</copy>
+		<copy todir="./jni/PluginInput/">
+		    <fileset dir="../Source/Android/PluginInput"/>
+		</copy>
+		<copy todir="./jni/PluginRSP/">
+		    <fileset dir="../Source/Android/PluginRSP"/>
+		</copy>
+		<copy todir="./jni/Project64-bridge/">
+		    <fileset dir="../Source/Android/Bridge"/>
+		</copy>
+		<copy todir="./jni/Project64-core/">
+		    <fileset dir="../Source/Project64-core"/>
+		</copy>
+		<copy todir="./jni/Settings/">
+		    <fileset dir="../Source/Settings"/>
+		</copy>
+	</target>
+</project>

Android/jni/3rdParty/7zip/.gitignore

@@ -0,0 +1,8 @@
+*.c
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg

Android/jni/3rdParty/png/.gitignore

@@ -0,0 +1,43 @@
+*.3
+*.5
+*.bat
+*.c
+*.com
+*.cpp
+*.def
+*.dsp
+*.dsw
+*.gcc
+*.h
+*.hp64
+*.ico
+*.in
+*.jpg
+*.mak
+*.mms
+*.pbxproj
+*.plg
+*.png
+*.ppc
+*.props
+*.rc
+*.sgi
+*.sh
+*.sln
+*.solaris
+*.std
+*.tc3
+*.txt
+*.unx
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+ANNOUNCE
+CHANGES
+configure
+COPYING
+INSTALL
+LICENSE
+makefile*
+README
+TODO

Android/jni/3rdParty/png/png.mk

@@ -0,0 +1,34 @@
+#########################
+# png
+#########################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./3rdParty/png
+
+LOCAL_MODULE := png
+
+LOCAL_C_INCLUDES :=               \
+    ./jni/3rdParty/               \
+                
+LOCAL_SRC_FILES := \
+    $(SRCDIR)/png.c               \
+    $(SRCDIR)/pngerror.c          \
+    $(SRCDIR)/pngget.c            \
+    $(SRCDIR)/pngmem.c            \
+    $(SRCDIR)/pngpread.c          \
+    $(SRCDIR)/pngread.c           \
+    $(SRCDIR)/pngrio.c            \
+    $(SRCDIR)/pngrtran.c          \
+    $(SRCDIR)/pngrutil.c          \
+    $(SRCDIR)/pngset.c            \
+    $(SRCDIR)/pngtest.c           \
+    $(SRCDIR)/pngtrans.c          \
+    $(SRCDIR)/pngwio.c            \
+    $(SRCDIR)/pngwrite.c          \
+    $(SRCDIR)/pngwtran.c          \
+    $(SRCDIR)/pngwutil.c          \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+include $(BUILD_STATIC_LIBRARY)

Android/jni/3rdParty/zlib/.gitignore

@@ -0,0 +1,12 @@
+*.c
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+ChangeLog
+INDEX
+README
+zconf.h.in

Android/jni/3rdParty/zlib/zlib.mk

@@ -0,0 +1,40 @@
+#########################
+# zlib
+#########################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./3rdParty/zlib
+
+LOCAL_MODULE := zlib
+
+LOCAL_C_INCLUDES :=         \
+
+LOCAL_SRC_FILES :=                       \
+    $(SRCDIR)/adler32.c           \
+    $(SRCDIR)/compress.c          \
+    $(SRCDIR)/crc32.c             \
+    $(SRCDIR)/deflate.c           \
+    $(SRCDIR)/gzclose.c           \
+    $(SRCDIR)/gzlib.c             \
+    $(SRCDIR)/gzread.c            \
+    $(SRCDIR)/gzwrite.c           \
+    $(SRCDIR)/infback.c           \
+    $(SRCDIR)/inffast.c           \
+    $(SRCDIR)/inflate.c           \
+    $(SRCDIR)/inftrees.c          \
+    $(SRCDIR)/trees.c             \
+    $(SRCDIR)/uncompr.c           \
+    $(SRCDIR)/zutil.c                   \
+    $(SRCDIR)/contrib/minizip/ioapi.c   \
+    $(SRCDIR)/contrib/minizip/miniunz.c \
+    $(SRCDIR)/contrib/minizip/minizip.c \
+    $(SRCDIR)/contrib/minizip/mztools.c \
+    $(SRCDIR)/contrib/minizip/unzip.c   \
+    $(SRCDIR)/contrib/minizip/zip.c     \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)        \
+    -DIOAPI_NO_64                       \
+    
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+include $(BUILD_STATIC_LIBRARY)

Android/jni/Android.mk

@@ -0,0 +1,30 @@
+JNI_LOCAL_PATH := $(call my-dir)
+
+AE_BRIDGE_INCLUDES := $(JNI_LOCAL_PATH)/ae-bridge/
+PJ64_SRC := $(JNI_LOCAL_PATH)/
+
+COMMON_CFLAGS :=                    \
+    -O3                             \
+    -ffast-math                     \
+    -fno-strict-aliasing            \
+    -fomit-frame-pointer            \
+    -frename-registers              \
+    -fsingle-precision-constant     \
+    -fvisibility=hidden             \
+    -DANDROID                       \
+    -DNO_ASM                        \
+
+COMMON_CPPFLAGS :=                  \
+    -fvisibility-inlines-hidden     \
+    -fexceptions                    \
+
+include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk
+include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk
+include $(JNI_LOCAL_PATH)/Common/common.mk
+include $(JNI_LOCAL_PATH)/Glide64/Glide64.mk
+include $(JNI_LOCAL_PATH)/PluginAudio/PluginAudio.mk
+include $(JNI_LOCAL_PATH)/PluginInput/PluginInput.mk
+include $(JNI_LOCAL_PATH)/PluginRSP/PluginRSP.mk
+include $(JNI_LOCAL_PATH)/Project64-bridge/Project64-bridge.mk
+include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk
+include $(JNI_LOCAL_PATH)/Settings/Settings.mk

Android/jni/Application.mk

@@ -0,0 +1,7 @@
+APP_STL := gnustl_static
+
+APP_ABI := armeabi-v7a armeabi x86
+# TODO: mips
+
+APP_PLATFORM := android-9
+APP_OPTIM := release

Android/jni/Common/.gitignore

@@ -0,0 +1,7 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg

Android/jni/Common/common.mk

@@ -0,0 +1,33 @@
+#########################
+# common
+#########################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./Common
+
+LOCAL_MODULE := common
+
+LOCAL_C_INCLUDES := ../     \
+    $(SDL_INCLUDES)         \
+               
+LOCAL_SRC_FILES := \
+    $(SRCDIR)/CriticalSection.cpp        \
+    $(SRCDIR)/DateTimeClass.cpp          \
+    $(SRCDIR)/FileClass.cpp              \
+    $(SRCDIR)/HighResTimeStamp.cpp       \
+    $(SRCDIR)/IniFileClass.cpp           \
+    $(SRCDIR)/LogClass.cpp               \
+    $(SRCDIR)/md5.cpp                    \
+    $(SRCDIR)/MemoryManagement.cpp       \
+    $(SRCDIR)/path.cpp                   \
+    $(SRCDIR)/Platform.cpp               \
+    $(SRCDIR)/StdString.cpp              \
+    $(SRCDIR)/SyncEvent.cpp              \
+    $(SRCDIR)/Thread.cpp                 \
+    $(SRCDIR)/Trace.cpp                  \
+    $(SRCDIR)/Util.cpp                   \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+include $(BUILD_STATIC_LIBRARY)

Android/jni/Glide64/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/Glide64/Glide64.mk

@@ -0,0 +1,82 @@
+###############################
+# Project64-gfx-glide64
+###############################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./
+
+LOCAL_MODULE := Project64-gfx-glide64
+LOCAL_STATIC_LIBRARIES := common                \
+                          zlib                  \
+                          Settings              \
+                          png                   \
+
+LOCAL_C_INCLUDES :=                             \
+    $(LOCAL_PATH)/$(SRCDIR)/Glitch64/inc        \
+    $(LOCAL_PATH)/$(SRCDIR)/3rdParty            \
+
+LOCAL_SRC_FILES :=                              \
+    $(SRCDIR)/Glitch64/OGLEScombiner.cpp        \
+    $(SRCDIR)/Glitch64/OGLESgeometry.cpp        \
+    $(SRCDIR)/Glitch64/OGLESglitchmain.cpp      \
+    $(SRCDIR)/Glitch64/OGLEStextures.cpp        \
+    $(SRCDIR)/Glitch64/OGLESwrappers.cpp        \
+    $(SRCDIR)/Glide64/3dmath.cpp                \
+    $(SRCDIR)/Glide64/Combine.cpp               \
+    $(SRCDIR)/Glide64/Config.cpp                \
+    $(SRCDIR)/Glide64/CRC.cpp                   \
+    $(SRCDIR)/Glide64/Debugger.cpp              \
+    $(SRCDIR)/Glide64/DepthBufferRender.cpp     \
+    $(SRCDIR)/Glide64/FBtoScreen.cpp            \
+    $(SRCDIR)/Glide64/Keys.cpp                  \
+    $(SRCDIR)/Glide64/Main.cpp                  \
+    $(SRCDIR)/Glide64/rdp.cpp                   \
+    $(SRCDIR)/Glide64/Settings.cpp              \
+    $(SRCDIR)/Glide64/TexBuffer.cpp             \
+    $(SRCDIR)/Glide64/TexCache.cpp              \
+    $(SRCDIR)/Glide64/trace.cpp                 \
+    $(SRCDIR)/Glide64/Util.cpp                  \
+    $(SRCDIR)/Glide64/Ext_TxFilter.cpp          \
+    $(SRCDIR)/GlideHQ/TxFilterExport.cpp        \
+    $(SRCDIR)/GlideHQ/TxFilter.cpp              \
+    $(SRCDIR)/GlideHQ/TxCache.cpp               \
+    $(SRCDIR)/GlideHQ/TxTexCache.cpp            \
+    $(SRCDIR)/GlideHQ/TxHiResCache.cpp          \
+    $(SRCDIR)/GlideHQ/TxQuantize.cpp            \
+    $(SRCDIR)/GlideHQ/TxUtil.cpp                \
+    $(SRCDIR)/GlideHQ/TextureFilters.cpp        \
+    $(SRCDIR)/GlideHQ/TextureFilters_2xsai.cpp  \
+    $(SRCDIR)/GlideHQ/TextureFilters_hq2x.cpp   \
+    $(SRCDIR)/GlideHQ/TextureFilters_hq4x.cpp   \
+    $(SRCDIR)/GlideHQ/TxImage.cpp               \
+    $(SRCDIR)/GlideHQ/TxReSample.cpp            \
+    $(SRCDIR)/GlideHQ/TxDbg.cpp                 \
+    $(SRCDIR)/GlideHQ/tc-1.1+/fxt1.c            \
+    $(SRCDIR)/GlideHQ/tc-1.1+/dxtn.c            \
+    $(SRCDIR)/GlideHQ/tc-1.1+/wrapper.c         \
+    $(SRCDIR)/GlideHQ/tc-1.1+/texstore.c        \
+
+LOCAL_CFLAGS :=         \
+    $(COMMON_CFLAGS)    \
+    -DUSE_FRAMESKIPPER  \
+    -DNOSSE             \
+    -DUSE_GLES          \
+    -fsigned-char       \
+    
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+    
+LOCAL_CPP_FEATURES := exceptions
+
+LOCAL_LDLIBS :=         \
+    -ldl                \
+    -lGLESv2            \
+    -llog               \
+
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+    # Use for ARM7a:
+    LOCAL_CFLAGS += -mfpu=vfp
+    LOCAL_CFLAGS += -mfloat-abi=softfp
+    
+endif
+
+include $(BUILD_SHARED_LIBRARY)

Android/jni/GlideHQ/.gitignore

@@ -0,0 +1,10 @@
+*.c
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/Glitch64/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/PluginAudio/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/PluginAudio/PluginAudio.mk

@@ -0,0 +1,30 @@
+######################
+# Project64-audio-android
+######################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./PluginAudio
+
+LOCAL_MODULE := Project64-audio-android
+LOCAL_STATIC_LIBRARIES := common \
+    Settings                     \
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_C_INCLUDES :=
+
+LOCAL_SRC_FILES :=               \
+    $(SRCDIR)/AudioSettings.cpp  \
+    $(SRCDIR)/Main.cpp           \
+    $(SRCDIR)/trace.cpp          \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
+     -D__STDC_LIMIT_MACROS           \
+
+LOCAL_LDLIBS :=         \
+    -llog               \
+    -lOpenSLES          \
+
+include $(BUILD_SHARED_LIBRARY)

Android/jni/PluginInput/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/PluginInput/PluginInput.mk

@@ -0,0 +1,24 @@
+######################
+# Project64-input-android
+######################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./PluginInput
+
+LOCAL_MODULE := Project64-input-android
+LOCAL_ARM_MODE := arm
+
+LOCAL_C_INCLUDES :=
+
+LOCAL_SRC_FILES :=             \
+    $(SRCDIR)/Main.cpp        \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
+     -D__STDC_LIMIT_MACROS           \
+
+LOCAL_LDLIBS :=         \
+    -llog               \
+
+include $(BUILD_SHARED_LIBRARY)

Android/jni/PluginRSP/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/PluginRSP/PluginRSP.mk

@@ -0,0 +1,32 @@
+######################
+# Project64-rsp-hle
+######################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./PluginRSP
+
+LOCAL_MODULE := Project64-rsp-hle
+LOCAL_ARM_MODE := arm
+
+LOCAL_C_INCLUDES :=
+
+LOCAL_SRC_FILES :=             \
+    $(SRCDIR)/alist.cpp        \
+    $(SRCDIR)/alist_audio.cpp  \
+    $(SRCDIR)/alist_naudio.cpp \
+    $(SRCDIR)/alist_nead.cpp   \
+    $(SRCDIR)/audio.cpp        \
+    $(SRCDIR)/cicx105.cpp      \
+    $(SRCDIR)/hle.cpp          \
+    $(SRCDIR)/jpeg.cpp         \
+    $(SRCDIR)/main.cpp         \
+    $(SRCDIR)/mem.cpp          \
+    $(SRCDIR)/mp3.cpp          \
+    $(SRCDIR)/musyx.cpp        \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) \
+     -D__STDC_LIMIT_MACROS           \
+
+include $(BUILD_SHARED_LIBRARY)

Android/jni/Project64-bridge/.gitignore

@@ -0,0 +1,9 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/Project64-bridge/Project64-bridge.mk

@@ -0,0 +1,39 @@
+######################
+# Project64-bridge
+######################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./Project64-bridge
+
+LOCAL_MODULE := Project64-bridge
+LOCAL_STATIC_LIBRARIES := common  \
+      Project64-core              \
+
+LOCAL_C_INCLUDES :=
+
+LOCAL_SRC_FILES :=                   \
+    $(SRCDIR)/JavaBridge.cpp         \
+    $(SRCDIR)/JavaRomList.cpp        \
+    $(SRCDIR)/jniBridge.cpp          \
+    $(SRCDIR)/jniBridgeSettings.cpp  \
+    $(SRCDIR)/NotificationClass.cpp  \
+    $(SRCDIR)/SyncBridge.cpp         \
+    $(SRCDIR)/UISettings.cpp         \
+
+LOCAL_CFLAGS :=         \
+    $(COMMON_CFLAGS)    \
+    -DUSE_GLES          \
+
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+LOCAL_LDLIBS :=         \
+    -llog               \
+
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+    # Use for ARM7a:
+    LOCAL_CFLAGS += -mfloat-abi=softfp
+    LOCAL_CFLAGS += -mfpu=vfp
+
+endif
+
+include $(BUILD_SHARED_LIBRARY)

Android/jni/Project64-core/.gitignore

@@ -0,0 +1,7 @@
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg

Android/jni/Project64-core/Project64-core.mk

@@ -0,0 +1,115 @@
+#########################
+# project64-core
+#########################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./Project64-core
+
+LOCAL_MODULE := Project64-core
+LOCAL_ARM_MODE := arm
+LOCAL_STATIC_LIBRARIES := common   \
+                          zlib     \
+
+LOCAL_C_INCLUDES := ../     \
+    ../3rdParty/            \
+
+               
+LOCAL_SRC_FILES :=                                                     \
+    $(SRCDIR)/AppInit.cpp                                              \
+    $(SRCDIR)/logging.cpp                                              \
+    $(SRCDIR)/MemoryExceptionFilter.cpp                                \
+    $(SRCDIR)/Multilanguage/LanguageClass.cpp                          \
+    $(SRCDIR)/Settings/LoggingSettings.cpp                             \
+    $(SRCDIR)/Settings/SettingsClass.cpp                               \
+    $(SRCDIR)/Settings/RecompilerSettings.cpp                          \
+    $(SRCDIR)/N64System/Interpreter/InterpreterCPU.cpp                 \
+    $(SRCDIR)/N64System/Interpreter/InterpreterOps.cpp                 \
+    $(SRCDIR)/N64System/Interpreter/InterpreterOps32.cpp               \
+    $(SRCDIR)/N64System/Mips/Audio.cpp                                 \
+    $(SRCDIR)/N64System/Mips/Dma.cpp                                   \
+    $(SRCDIR)/N64System/Mips/Disk.cpp                                  \
+    $(SRCDIR)/N64System/Mips/Eeprom.cpp                                \
+    $(SRCDIR)/N64System/Mips/FlashRam.cpp                              \
+    $(SRCDIR)/N64System/Mips/GBCart.cpp                                \
+    $(SRCDIR)/N64System/Mips/MemoryVirtualMem.cpp                      \
+    $(SRCDIR)/N64System/Mips/Mempak.cpp                                \
+    $(SRCDIR)/N64System/Mips/OpcodeName.cpp                            \
+    $(SRCDIR)/N64System/Mips/PifRam.cpp                                \
+    $(SRCDIR)/N64System/Mips/RegisterClass.cpp                         \
+    $(SRCDIR)/N64System/Mips/Rumblepak.cpp                             \
+    $(SRCDIR)/N64System/Mips/Transferpak.cpp                           \
+    $(SRCDIR)/N64System/Mips/Sram.cpp                                  \
+    $(SRCDIR)/N64System/Mips/SystemEvents.cpp                          \
+    $(SRCDIR)/N64System/Mips/SystemTiming.cpp                          \
+    $(SRCDIR)/N64System/Mips/TLBclass.cpp                              \
+    $(SRCDIR)/N64System/Recompiler/CodeBlock.cpp                       \
+    $(SRCDIR)/N64System/Recompiler/CodeSection.cpp                     \
+    $(SRCDIR)/N64System/Recompiler/SectionInfo.cpp                     \
+    $(SRCDIR)/N64System/Recompiler/FunctionInfo.cpp                    \
+    $(SRCDIR)/N64System/Recompiler/FunctionMapClass.cpp                \
+    $(SRCDIR)/N64System/Recompiler/LoopAnalysis.cpp                    \
+    $(SRCDIR)/N64System/Recompiler/RecompilerClass.cpp                 \
+    $(SRCDIR)/N64System/Recompiler/RecompilerCodeLog.cpp               \
+    $(SRCDIR)/N64System/Recompiler/RecompilerMemory.cpp                \
+    $(SRCDIR)/N64System/Recompiler/RegBase.cpp                         \
+    $(SRCDIR)/N64System/Recompiler/Arm/ArmOps.cpp                      \
+    $(SRCDIR)/N64System/Recompiler/Arm/ArmRecompilerOps.cpp            \
+    $(SRCDIR)/N64System/Recompiler/Arm/ArmRegInfo.cpp                  \
+    $(SRCDIR)/N64System/Recompiler/x86/x86ops.cpp                      \
+    $(SRCDIR)/N64System/Recompiler/x86/x86RecompilerOps.cpp            \
+    $(SRCDIR)/N64System/Recompiler/x86/x86RegInfo.cpp                  \
+    $(SRCDIR)/N64System/CheatClass.cpp                                 \
+    $(SRCDIR)/N64System/FramePerSecondClass.cpp                        \
+    $(SRCDIR)/N64System/N64Class.cpp                                   \
+    $(SRCDIR)/N64System/N64RomClass.cpp                                \
+    $(SRCDIR)/N64System/ProfilingClass.cpp                             \
+    $(SRCDIR)/N64System/SpeedLimiterClass.cpp                          \
+    $(SRCDIR)/N64System/SystemGlobals.cpp                              \
+    $(SRCDIR)/N64System/EmulationThread.cpp                            \
+    $(SRCDIR)/N64System/N64DiskClass.cpp                               \
+    $(SRCDIR)/Plugins/AudioPlugin.cpp                                  \
+    $(SRCDIR)/Plugins/GFXplugin.cpp                                    \
+    $(SRCDIR)/Plugins/ControllerPlugin.cpp                             \
+    $(SRCDIR)/Plugins/RSPPlugin.cpp                                    \
+    $(SRCDIR)/Plugins/PluginBase.cpp                                   \
+    $(SRCDIR)/Plugins/PluginClass.cpp                                  \
+    $(SRCDIR)/RomList/RomList.cpp                                      \
+    $(SRCDIR)/Settings/SettingType/SettingsType-Application.cpp        \
+    $(SRCDIR)/Settings/SettingType/SettingsType-ApplicationIndex.cpp   \
+    $(SRCDIR)/Settings/SettingType/SettingsType-ApplicationPath.cpp    \
+    $(SRCDIR)/Settings/SettingType/SettingsType-Cheats.cpp             \
+    $(SRCDIR)/Settings/SettingType/SettingsType-GameSetting.cpp        \
+    $(SRCDIR)/Settings/SettingType/SettingsType-GameSettingIndex.cpp   \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RelativePath.cpp       \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RDBCpuType.cpp         \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RDBOnOff.cpp           \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RDBRamSize.cpp         \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RDBSaveChip.cpp        \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RDBYesNo.cpp           \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabase.cpp        \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp   \
+    $(SRCDIR)/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp \
+    $(SRCDIR)/Settings/SettingType/SettingsType-SelectedDirectory.cpp  \
+    $(SRCDIR)/Settings/SettingType/SettingsType-TempBool.cpp           \
+    $(SRCDIR)/Settings/SettingType/SettingsType-TempNumber.cpp         \
+    $(SRCDIR)/Settings/SettingType/SettingsType-TempString.cpp         \
+    $(SRCDIR)/Settings/DebugSettings.cpp                               \
+    $(SRCDIR)/Settings/GameSettings.cpp                                \
+    $(SRCDIR)/Settings/N64SystemSettings.cpp                           \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
+    # Use for ARM7a:
+    LOCAL_SRC_FILES += $(SRCDIR)/N64System/Recompiler/Arm/asm_functions.S
+    LOCAL_CFLAGS += -mfloat-abi=softfp
+    LOCAL_CFLAGS += -mfpu=vfp
+
+else ifeq ($(TARGET_ARCH_ABI), armeabi)
+    # Use for ARM7a:
+    LOCAL_SRC_FILES += $(SRCDIR)/N64System/Recompiler/Arm/asm_functions.S
+
+endif
+
+include $(BUILD_STATIC_LIBRARY)

Android/jni/Settings/.gitignore

@@ -0,0 +1,10 @@
+*.c
+*.cpp
+*.h
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.dsp
+*.plg
+*.txt
+*.rc

Android/jni/Settings/Settings.mk

@@ -0,0 +1,18 @@
+#########################
+# Settings
+#########################
+include $(CLEAR_VARS)
+LOCAL_PATH := $(JNI_LOCAL_PATH)
+SRCDIR := ./Settings
+
+LOCAL_MODULE := Settings
+
+LOCAL_C_INCLUDES := ../     \
+               
+LOCAL_SRC_FILES := \
+    $(SRCDIR)/Settings.cpp        \
+
+LOCAL_CFLAGS := $(COMMON_CFLAGS)
+LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
+
+include $(BUILD_STATIC_LIBRARY)