ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Add Android/Bridge to clang checking

This commit is contained in:
zilmar 2023-10-26 11:05:20 +10:30
parent ebdef8bbdb
commit bf480623bd
12 changed files with 127 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/Bridge/JavaBridge.cpp
View File

@ -1,7 +1,7 @@
#include <Project64-core/TraceModulesProject64.h>
#include <Common/Trace.h>
#include "JavaBridge.h"
#include "jniBridge.h"
#include <Common/Trace.h>
#include <Project64-core/TraceModulesProject64.h>
#ifdef ANDROID
JavaBridge::JavaBridge(JavaVM * vm) :

20
Source/Android/Bridge/Notification.cpp
View File

@ -1,10 +1,10 @@
#include <Common/StdString.h>
#include <Common/Trace.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Settings.h>
#include <Project64-core/N64System/N64System.h>
#include "Notification.h"
#include "JavaBridge.h"
#include <Common/StdString.h>
#include <Common/Trace.h>
#include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Settings.h>
#if defined(ANDROID)
#include <android/log.h>
@ -87,7 +87,10 @@ void CNotificationImp::DisplayMessage(int DisplayTime, LanguageStringID StringID
void CNotificationImp::DisplayMessage(int DisplayTime, const char * Message) const
{
#ifdef ANDROID
if (g_JavaBridge == NULL) { return; }
if (g_JavaBridge == NULL)
{
return;
}
g_JavaBridge->DisplayMessage(Message, DisplayTime);
#else
// Ignore warning usage
@ -99,7 +102,10 @@ void CNotificationImp::DisplayMessage(int DisplayTime, const char * Message) con
void CNotificationImp::DisplayMessage2(const char * Message) const
{
#ifdef ANDROID
if (g_JavaBridge == NULL) { return; }
if (g_JavaBridge == NULL)
{
return;
}
g_JavaBridge->DisplayMessage2(Message);
#else

4
Source/Android/Bridge/UISettings.cpp
View File

@ -1,11 +1,11 @@
#include "UISettings.h"
#include <Project64-core/Settings.h>
#include <Project64-core/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/Settings/SettingType/SettingsType-ApplicationIndex.h>
#include <Project64-core/Settings/SettingType/SettingsType-RelativePath.h>
#include <Project64-core/Settings/SettingType/SettingsType-GameSetting.h>
#include <Project64-core/Settings/SettingType/SettingsType-RelativePath.h>
#include <Project64-core/Settings/SettingType/SettingsType-TempNumber.h>
#include <Project64-core/Version.h>
#include "UISettings.h"
void RegisterUISettings(void)
{

4
Source/Android/Bridge/UISettings.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <string>
#include <stdint.h>
#include <Project64-core\Settings\SettingsID.h>
#include <stdint.h>
#include <string>
enum UISettingID
{

33
Source/Android/Bridge/jniBridge.cpp
View File

@ -2,23 +2,23 @@
#ifdef ANDROID
#include <jni.h>
#endif
#include <Project64-core/AppInit.h>
#include <Project64-core/Version.h>
#include <Project64-core/TraceModulesProject64.h>
#include <Project64-core/Settings.h>
#include <Project64-core/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Common/Trace.h>
#include <Common/Thread.h>
#include <Common/StdString.h>
#include "jniBridge.h"
#include "jniBridgeSettings.h"
#include "JavaBridge.h"
#include "SyncBridge.h"
#include "UISettings.h"
#include "JavaRomList.h"
#include "Notification.h"
#include "SyncBridge.h"
#include "UISettings.h"
#include "jniBridge.h"
#include "jniBridgeSettings.h"
#include <Common/StdString.h>
#include <Common/Thread.h>
#include <Common/Trace.h>
#include <Project64-core/AppInit.h>
#include <Project64-core/N64System/N64System.h>
#include <Project64-core/N64System/SystemGlobals.h>
#include <Project64-core/Settings.h>
#include <Project64-core/Settings/SettingType/SettingsType-Application.h>
#include <Project64-core/TraceModulesProject64.h>
#include <Project64-core/Version.h>
#ifdef _WIN32
#define EXPORT extern "C" __declspec(dllexport)
@ -89,7 +89,10 @@ EXPORT jint CALL JNI_OnLoad(JavaVM* vm, void* reserved)
void AddRecentRom(const char * ImagePath)
{
if (ImagePath == NULL) { return; }
if (ImagePath == NULL)
{
return;
}
WriteTrace(TraceUserInterface, TraceDebug, "Start (ImagePath: %s)", ImagePath);
// Get information about the stored ROM list

7
Source/Android/Bridge/jniBridgeSettings.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <Project64-core\Settings\SettingsID.h>
#include <string>
#include <map>
#include <string>
class CJniBridegSettings
{
@ -12,7 +12,10 @@ public:
~CJniBridegSettings();
SettingID TranslateSettingID(const char * SettingName);
static inline bool bCPURunning ( void) { return m_bCPURunning; }
static inline bool bCPURunning(void)
{
return m_bCPURunning;
}
private:
SettingNameList m_SettingNameList;

1
Source/Script/clang.cmd
View File

@ -11,6 +11,7 @@ set ScanDir[1]="%base_dir%\Source\Project64"
set ScanDir[2]="%base_dir%\Source\Project64-core"
set ScanDir[3]="%base_dir%\Source\Project64-rsp"
set ScanDir[4]="%base_dir%\Source\Project64-rsp-core"
set ScanDir[5]="%base_dir%\Source\Android\Bridge"
set ScanFiles[0]="*.cpp"
set ScanFiles[1]="*.h"