Compare commits

..

No commits in common. "develop" and "v2.3" have entirely different histories.

4118 changed files with 252379 additions and 716211 deletions

16
.gitattributes vendored Normal file
View File

@ -0,0 +1,16 @@
# All files that are binary and should not be normalized
# Images
*.png binary
*.jpg binary
*.psd binary
*.gif binary
*.bmp binary
*.ico binary
*.cur binary
# Binary data
*.exe binary
*.dll binary
*.e32 binary
*.lib binary

View File

@ -1,28 +0,0 @@
# Introduction
First of all, thank you for considering contributing to Project64! Project64 is an open-source project, and we love to receive contributions from the community. Contributions help fix bugs, add new features, and improve the project. There are many ways to contribute, from writing and improving the documentation, testing, submitting bug reports and feature requests, or writing code that can be incorporated into Project64 itself.
If you are looking for support or need help, please join the [Discord](https://discord.gg/Cg3zquF)! It's the best way to get your questions answered quickly. Please do not open a GitHub issue without first reading through the [support document](../Docs/SUPPORT.md).
Following these guidelines will help ensure that users and developers alike can work together to achieve the project's goals.
Please do NOT post any copyrighted materials. This includes (but is not limited to) ROMs, ROM hacks, IPL and firmware files, etc.
Save states and game saves do not fall under this category, so please post them only if they are applicable to your issue!
# Github Contribution Guide
1. Create a fork of this repository on your own account.
2. Create a new branch from the `develop` branch.
* Choose a meaningful name for the branch (e.g. `fix`, `documentation`).
3. Commit any changes onto your new branch.
4. If sensible, squash all commits into one. This helps clean up the vetting process.
* Ensure that commit messages are clear, concise, and informative. They should include information about all changes made, especially when squashing multiple commits into one.
5. Once all commits have been made and squashed, rebase all changes in your branch.
* Rebasing will resolve any merge confilcts that your changes may cause.
6. Create a pull request to the `develop` branch
* The pull request should be descriptive and include all changes made to the code base. If multiple files have been changed, organize them such that they can be easily followed by a reviewer.
* Make sure that you **allow edits** by maintainers when making the Pull Request.
7. Your changes should be reviewed and fixes may be made to your changes.
* If fixes are made please make sure to address them.

1
.github/FUNDING.yml vendored
View File

@ -1 +0,0 @@
custom: "https://pj64-emu.com/support-project64.html"

View File

@ -1,147 +0,0 @@
name: Bug report
description: >-
If you experience a bug in Project64 and/or its maintained plugins, please open an
issue here and fill out the template.
title: '[Bug]: '
labels:
- bug
- triage
assignees:
- null
body:
- type: markdown
attributes:
value: '## FAQs and a warning'
- type: markdown
attributes:
value: >-
Please read the support document in this repository before opening an issue!
If you are having issues with a plugin that isn't included with or
supported by the Project64 team, we cannot support you other then pointing
you to the developer or repository for those plugins.
Please join the Discord first and ask questions and ask for support there
first. If the issue should require an open GitHub issue, somebody will ask
you to open one.
We have a lot of people in the Discord who are more then
happy to help you with any issues you may be having!
Please avoid opening issues if you do not meet the minimum requirements
for Project64. These are outlined in the README for this repository.
- type: textarea
id: what-should-happen
attributes:
label: Expected behavior?
description: How was the emulator supposed to behave
placeholder: Tell us what you expect to see!; use screenshots if necessary.
value: null
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: Actual behavior?
description: Describe in detail the issue you encountered.
placeholder: Tell us what you see!; use screenshots if necessary.
value: null
validations:
required: true
- type: textarea
id: repro
attributes:
label: Steps to reproduce the problem
description: How do you trigger this bug? Please walk us through it step by step.
value: |
1.
2.
3.
4.
5.
...
validations:
required: true
- type: textarea
id: error-messages
attributes:
label: Error messages?
description: Was there an error message?
placeholder: List any error messages here!; use screenshots if necessary.
value: null
validations:
required: false
- type: textarea
id: ROM_details
attributes:
label: What game were you playing?
description: What is the specific game/ROM that you encountered an issue with?
value: |
Title:
Nintendo 64 game or Nintendo 64 Disk Drive:
ROM information (First you must uncheck "hide advanced settings" in the settings menu, then File > ROM info should show up, post the information contained there in this field. Alternatively, you can right click the ROM in the ROM browser and hit "ROM information".):
Save type: (attach game save or save state here)
Original or modified ROM?:(attach patch if applicable here)
validations:
required: false
- type: textarea
id: SysInfo
attributes:
label: Specifications and build details
description: >-
List your PC specifications/information, you can obtain this from MSINFO32 and the
emulators title bar and about page.
value: |
Project64: (include commit version number and whether you are using the
32-bit or 64-bit version)
OS: (include version and OS build number using WinVer):
CPU:
RAM:
Graphics:
validations:
required: true
- type: checkboxes
id: DefaultPlugins
attributes:
label: Using included plugins
description: >-
Please make sure you are using the included plugins before opening an
issue:
options:
- label: >-
I can confirm I am using the included RSP, audio, input, and graphics
plugins
required: true
- type: textarea
id: PluginsUsed
attributes:
label: Plugins used while the issue occurred
description: What plugins is the issue occuring with?
value: |
Graphics plugin (and HLE or LLE):
Audio plugin:
Input plugin:
RSP plugin:
validations:
required: true
- type: checkboxes
id: Copyright_Compliance
attributes:
label: Copyright Compliance
description: >-
Please do not attach any files that infringe on the copyright of any
party.
options:
- label: There are no infringing files attached to this bug report.
required: true

View File

@ -1,38 +0,0 @@
name: Feature request
description: >-
If you would like a new feature in Project64 or its default plugins, please
open an issue here and fill out the template.
title: '[Feature request]: '
labels:
- feature request
- enhancement
assignees:
- null
body:
- type: textarea
id: feature-request
attributes:
label: Request box
description: What feature would you like to see added?
placeholder: Tell us what you would like to see added to Project64!
value: null
validations:
required: true
- type: textarea
id: reason-why
attributes:
label: Reason box
description: Provide reasoning for the new feature
placeholder: Tell us why you'd like to see this feature added
value: null
validations:
required: true
- type: textarea
id: Examples
attributes:
label: Examples
description: Provide examples of this feature
placeholder: Provide examples or screenshots of this feature in other software
value: null
validations:
required: true

View File

@ -1,5 +0,0 @@
blank_issues_enabled: false
contact_links:
- name: Project64 Community Support
url: https://discord.gg/Cg3zquF
about: For general questions and support please join the Discord!

View File

@ -1,13 +0,0 @@
[Add description of the PR here]
Fixes #
### Proposed changes
-
-
-
### Does this make breaking changes?
### Does this version of Project64 compile and run without issue?

124
.gitignore vendored
View File

@ -19,115 +19,65 @@
*.o
Thumbs.db
/.vs
/Bin/Debug
/Bin/Debug64
/Bin/Package
/Bin/Win32/Debug
/Bin/Win32/Release
/Bin/x64/Debug
/Bin/x64/Release
/Bin/Release
/Bin/Release64
/build
/Config/Cheats-User
/Config/Enhancements-User
/Config/Project64.cache3
/Config/Project64.cfg
/Config/Project64.rdn
/Config/Project64.sc3
/Config/Project64.zcache
/git.properties
/ipch
/Package
/Plugin/Win32/Audio/AndroidAudio_d.dll
/Plugin/Win32/Audio/AndroidAudio.dll
/Plugin/Win32/Audio/Project64-Audio_d.dll
/Plugin/Win32/Audio/Project64-Audio.dll
/Plugin/Win32/GFX/lib
/Plugin/Win32/GFX/map
/Plugin/Win32/GFX/pdb
/Plugin/Win32/GFX/Project64-Video_d.dll
/Plugin/Win32/GFX/Project64-Video.dll
/Plugin/Win32/Input/AndroidInput_d.dll
/Plugin/Win32/Input/AndroidInput.dll
/Plugin/Win32/Input/lib
/Plugin/Win32/Input/map
/Plugin/Win32/Input/pdb
/Plugin/Win32/Input/PJ64_NRage_d.dll
/Plugin/Win32/Input/PJ64_NRage.dll
/Plugin/Win32/Input/Project64-Input_d.dll
/Plugin/Win32/Input/Project64-Input.dll
/Plugin/Win32/RSP/lib
/Plugin/Win32/RSP/map
/Plugin/Win32/RSP/pdb
/Plugin/Win32/RSP/Project64-RSP_d.dll
/Plugin/Win32/RSP/Project64-RSP.dll
/Plugin/Win32/RSP/RSP 1.7.dll
/Plugin/Win32/RSP/RSP_d 1.7.dll
/Plugin/Win32/RSP/RSP-HLE_d.dll
/Plugin/Win32/RSP/RSP-HLE.dll
/Plugin/Win32/RSP/Project64-RSP-Basic_d.dll
/Plugin/Win32/RSP/Project64-RSP-Basic.dll
/Plugin/x64/Audio/AndroidAudio_d.dll
/Plugin/x64/Audio/AndroidAudio.dll
/Plugin/x64/Audio/Project64-Audio_d.dll
/Plugin/x64/Audio/Project64-Audio.dll
/Plugin/x64/GFX/lib
/Plugin/x64/GFX/map
/Plugin/x64/GFX/pdb
/Plugin/x64/GFX/Project64-Video_d.dll
/Plugin/x64/GFX/Project64-Video.dll
/Plugin/x64/Input/AndroidInput_d.dll
/Plugin/x64/Input/AndroidInput.dll
/Plugin/x64/Input/lib
/Plugin/x64/Input/map
/Plugin/x64/Input/pdb
/Plugin/x64/Input/PJ64_NRage_d.dll
/Plugin/x64/Input/PJ64_NRage.dll
/Plugin/x64/Input/Project64-Input_d.dll
/Plugin/x64/Input/Project64-Input.dll
/Plugin/x64/RSP/lib
/Plugin/x64/RSP/map
/Plugin/x64/RSP/pdb
/Plugin/x64/RSP/Project64-RSP_d.dll
/Plugin/x64/RSP/Project64-RSP.dll
/Plugin/x64/RSP/RSP 1.7.dll
/Plugin/x64/RSP/RSP_d 1.7.dll
/Plugin/x64/RSP/RSP-HLE_d.dll
/Plugin/x64/RSP/RSP-HLE.dll
/Plugin/x64/RSP/Project64-RSP-Basic_d.dll
/Plugin/x64/RSP/Project64-RSP-Basic.dll
/Plugin/Audio/AndroidAudio.dll
/Plugin/Audio/AndroidAudio_d.dll
/Plugin/GFX/lib
/Plugin/GFX/map
/Plugin/GFX/pdb
/Plugin/GFX/PJ64Glide64.dll
/Plugin/GFX/PJ64Glide64_d.dll
/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
/Plugin/RSP/map
/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_d.dll
/Plugin64/Audio/AndroidAudio.dll
/Plugin64/Audio/Project64-Audio_d.dll
/Plugin64/Audio/Project64-Audio.dll
/Plugin64/Audio/AndroidAudio_d.dll
/Plugin64/GFX/lib
/Plugin64/GFX/map
/Plugin64/GFX/pdb
/Plugin64/GFX/PJ64Glide64_d.dll
/Plugin64/GFX/PJ64Glide64.dll
/Plugin64/GFX/Project64-Video_d.dll
/Plugin64/GFX/Project64-Video.dll
/Plugin64/Input/AndroidInput_d.dll
/Plugin64/Input/AndroidInput.dll
/Plugin64/GFX/PJ64Glide64_d.dll
/Plugin64/Input/lib
/Plugin64/Input/map
/Plugin64/Input/pdb
/Plugin64/Input/PJ64_NRage_d.dll
/Plugin64/Input/AndroidInput.dll
/Plugin64/Input/AndroidInput_d.dll
/Plugin64/Input/PJ64_NRage.dll
/Plugin64/Input/Project64-Input_d.dll
/Plugin64/Input/Project64-Input.dll
/Plugin64/Input/PJ64_NRage_d.dll
/Plugin64/RSP/lib
/Plugin64/RSP/map
/Plugin64/RSP/pdb
/Plugin64/RSP/RSP 1.7.dll
/Plugin64/RSP/RSP_d 1.7.dll
/Plugin64/RSP/RSP-HLE_d.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
/Source/3rdParty/wx/lib/vc_lib/mswu/wx/setup.h
/Source/3rdParty/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h
/Source/3rdParty/wx/lib/vc_lib/mswud/wx/setup.h
/Save
/Source/nragev20/Version.h
/Source/Project64-audio/Version.h
/Source/Project64-core/Version.h
/Source/Project64-input/Version.h
/Source/Project64-video/Version.h
/Source/Project64-rsp-core/Version.h
/Plugin/Win32/GFX/GLideN64
/Plugin/x64/GFX/GLideN64

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "Source/GLideN64/Source"]
path = Source/GLideN64/Source
url = https://github.com/gonetz/GLideN64.git

View File

@ -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>

View File

@ -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>

29
Android/.gitignore vendored
View File

@ -1,14 +1,15 @@
assets/Config
assets/Lang
config/version.gradle
app/src/main/assets/assets.zip
*.iml
.gradle
local.properties
.idea/
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
build
# 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

53
Android/.project.init Normal file
View File

@ -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>

View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64" android:versionCode="3" android:versionName="1.0" >
<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>
<!--
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>

View File

@ -1,36 +0,0 @@
@ECHO OFF
SETLOCAL
set origdir=%cd%
cd /d %~dp0..\..\
set base_dir=%cd%
cd /d %origdir%
echo buildAssets
call "%base_dir%\Android\Script\buildAssets.cmd"
set Result=%ERRORLEVEL%
echo Done - ERRORLEVEL: %Result%
IF %Result% NEQ 0 goto :EndErr
echo UpdateVersionNumber
call "%base_dir%\Android\Script\UpdateVersionNumber.cmd"
set Result=%ERRORLEVEL%
echo Done - ERRORLEVEL: %Result%
IF %Result% NEQ 0 goto :EndErr
echo copySource
call "%base_dir%\Android\Script\copySource.cmd"
set Result=%ERRORLEVEL%
echo Done - ERRORLEVEL: %Result%
IF %Result% NEQ 0 goto :EndErr
goto :end
:EndErr
ENDLOCAL
echo Build failed
exit /B 1
:End
ENDLOCAL
exit /B 0

Binary file not shown.

View File

@ -1,18 +0,0 @@
@ECHO OFF
SETLOCAL
set origdir=%cd%
cd /d %~dp0..\..\
set base_dir=%cd%
cd /d %origdir%
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Android\config\version.gradle.in" "%base_dir%\Android\config\version.gradle"
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Source\Project64-core\Version.h.in" "%base_dir%\Source\Project64-core\Version.h"
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Source\Project64-rsp-core\Version.h.in" "%base_dir%\Source\Project64-rsp-core\Version.h"
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Source\Project64-audio\Version.h.in" "%base_dir%\Source\Project64-audio\Version.h"
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Source\Project64-video\Version.h.in" "%base_dir%\Source\Project64-video\Version.h"
"%base_dir%\Android\Script\UpdateVersion.exe" "%base_dir%\Source\RSP\Version.h.in" "%base_dir%\Source\RSP\Version.h"
:End
ENDLOCAL
exit /B 0

61
Android/Script/build.cmd Normal file
View File

@ -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 -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

View File

@ -8,35 +8,23 @@ set base_dir=%cd%
cd /d %origdir%
echo Building Lang files
xcopy "%base_dir%/Lang" "%base_dir%/Android/assets/Lang/" /D /I /F /Y /E
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/Config/" mkdir "%base_dir%/Android/assets/Config/"
copy "%base_dir%\Config\Audio.rdb" "%base_dir%\Android\assets\Config\"
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\Video.rdb" "%base_dir%\Android\assets\Config\"
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\Config\"
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\Config\"
copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Android\assets\project64_data\Config\"
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
IF NOT EXIST "%base_dir%/Android/assets/Config/Cheats/" mkdir "%base_dir%/Android/assets/Config/Cheats/"
xcopy "%base_dir%/Config/Cheats" "%base_dir%/Android/assets/Config/Cheats/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
IF NOT EXIST "%base_dir%/Android/assets/Config/Enhancements/" mkdir "%base_dir%/Android/assets/Config/Enhancements/"
xcopy "%base_dir%/Config/Enhancements" "%base_dir%/Android/assets/Config/Enhancements/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
IF NOT EXIST "%base_dir%/Android/app/src/main/assets/" mkdir "%base_dir%/Android/app/src/main/assets/"
IF EXIST "%base_dir%/Android/app/src/main/assets/assets.zip" del "%base_dir%\Android\app\src\main\assets\assets.zip"
powershell Compress-Archive "%base_dir%/Android/assets/*" "%base_dir%/Android/app/src/main/assets/assets.zip"
goto :end
:End

View File

@ -11,10 +11,6 @@ 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/asmjit
xcopy "%base_dir%/Source/3rdParty/asmjit" "%base_dir%/Android/jni/3rdParty/asmjit/" /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)
@ -27,38 +23,38 @@ 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/Plugin-Input/" /D /I /F /Y /E
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/Plugin-Rsp/" /D /I /F /Y /E
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-audio
xcopy "%base_dir%/Source/Project64-audio" "%base_dir%/Android/jni/Project64-audio/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Project64-plugin-spec
xcopy "%base_dir%/Source/Project64-plugin-spec" "%base_dir%/Android/jni/Project64-plugin-spec/" /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 Project64-rsp-core
xcopy "%base_dir%/Source/Project64-rsp-core" "%base_dir%/Android/jni/Project64-rsp-core/" /D /I /F /Y /E
IF %ERRORLEVEL% NEQ 0 (exit /B 1)
echo copy Project64-video
xcopy "%base_dir%/Source/Project64-video" "%base_dir%/Android/jni/Project64-video/" /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)

View File

@ -1 +0,0 @@
/build

View File

@ -1,49 +0,0 @@
plugins {
id 'com.android.application'
}
apply from: '../config/version.gradle'
android {
defaultConfig {
applicationId = "emu.Project64"
externalNativeBuild {
cmake {
cppFlags '-std=c++11'
}
}
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.android.material:material:1.1.0'
implementation "androidx.drawerlayout:drawerlayout:1.0.0"
implementation 'androidx.preference:preference:1.1.1'
testImplementation 'junit:junit:4.12'
implementation project(':jni:3rdParty:png')
implementation project(':jni:3rdParty:zlib')
implementation project(':jni:Common')
implementation project(':jni:Settings')
implementation project(':jni:Project64-rsp-core')
implementation project(':jni:Project64-core')
implementation project(':jni:Project64-bridge')
implementation project(':jni:Project64-video')
implementation project(':jni:Project64-audio')
implementation project(':jni:Plugin-input')
implementation project(':jni:Plugin-rsp')
}

View File

@ -1,17 +0,0 @@
<!-- Copyright (C) 2012 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--><!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/ub-gcore-manchego-nightly/vendor/unbundled_google/packages/OneUp/client/AndroidManifest.xml --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="6171000" android:versionName="6.1.71-000" package="com.google.android.gms">
<uses-sdk android:minSdkVersion="9"/>
<application/>
</manifest>

View File

@ -1,17 +0,0 @@
Library Project including Google Play services client jar.
This can be used by an Android project to use the API's provided
by Google Play services.
There is technically no source, but the src folder is necessary
to ensure that the build system works. The content is actually
located in the libs/ directory.
USAGE:
Make sure you import this Android library project into your IDE
and set this project as a dependency.
Note that if you use proguard, you will want to include the
options from proguard.txt in your configuration.

View File

@ -1 +0,0 @@
doc=../../../docs/reference

View File

@ -1,20 +0,0 @@
-keep class * extends java.util.ListResourceBundle {
protected Object[][] getContents();
}
# Keep SafeParcelable value, needed for reflection. This is required to support backwards
# compatibility of some classes.
-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
public static final *** NULL;
}
# Keep the names of classes/members we need for client functionality.
-keepnames @com.google.android.gms.common.annotation.KeepName class *
-keepclassmembernames class * {
@com.google.android.gms.common.annotation.KeepName *;
}
# Needed for Parcelable/SafeParcelable Creators to not get stripped
-keepnames class * implements android.os.Parcelable {
public static final ** CREATOR;
}

View File

@ -1,15 +0,0 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-22
android.library=true

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:color="@color/common_signin_btn_dark_text_pressed" />
<item
android:state_enabled="false"
android:state_focused="true"
android:color="@color/common_signin_btn_dark_text_disabled" />
<item
android:state_focused="true"
android:color="@color/common_signin_btn_dark_text_focused" />
<item
android:state_enabled="false"
android:color="@color/common_signin_btn_dark_text_disabled" />
<item
android:color="@color/common_signin_btn_dark_text_default" />
</selector>

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:color="@color/common_signin_btn_light_text_pressed" />
<item
android:state_enabled="false"
android:state_focused="true"
android:color="@color/common_signin_btn_light_text_disabled" />
<item
android:state_focused="true"
android:color="@color/common_signin_btn_light_text_focused" />
<item
android:state_enabled="false"
android:color="@color/common_signin_btn_light_text_disabled" />
<item
android:color="@color/common_signin_btn_light_text_default" />
</selector>

View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 Google Inc. All Rights Reserved. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false" android:color="@color/wallet_bright_foreground_disabled_holo_light"/>
<item android:state_window_focused="false" android:color="@color/wallet_bright_foreground_holo_light"/>
<item android:state_pressed="true" android:color="@color/wallet_bright_foreground_holo_light"/>
<item android:state_selected="true" android:color="@color/wallet_bright_foreground_holo_light"/>
<item android:color="@color/wallet_bright_foreground_holo_light"/> <!-- not selected -->
</selector>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014 Google Inc. All Rights Reserved. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="false" android:color="@color/wallet_dim_foreground_disabled_holo_dark"/>
<item android:state_window_focused="false" android:color="@color/wallet_dim_foreground_holo_dark"/>
<item android:state_selected="true" android:state_enabled="false" android:color="@color/wallet_dim_foreground_disabled_holo_dark"/>
<item android:state_pressed="true" android:state_enabled="false" android:color="@color/wallet_dim_foreground_disabled_holo_dark"/>
<item android:state_selected="true" android:color="@color/wallet_dim_foreground_holo_dark"/>
<item android:state_pressed="true" android:color="@color/wallet_dim_foreground_holo_dark"/>
<item android:state_enabled="false" android:color="@color/wallet_dim_foreground_disabled_holo_dark"/>
<item android:color="@color/wallet_dim_foreground_holo_dark"/> <!-- not selected -->
</selector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 902 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 936 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 934 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 621 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 732 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 828 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 873 B

Some files were not shown because too many files have changed in this diff Show More