preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16342 from hrydgard/gradle-upgrade

Browse Source 
Gradle upgrade, lock NDK version
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2022-11-06 09:55:30 +01:00
2 parents 15fdb54a59 4d81506046
commit 6873444d39
5 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/VR/PPSSPPVR.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ bool IsVRBuild() {
}
#if PPSSPP_PLATFORM(ANDROID)
void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name) {
void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name) {
//Get device vendor (uppercase)
char vendor[64];
Common/VR/PPSSPPVR.h
+2 -2
View File
@@ -21,7 +21,7 @@ enum VRCompatFlag {
// VR app flow integration
bool IsVRBuild();
void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name);
void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name);
void EnterVR(bool firstStart, void* vulkanContext);
void GetVRResolutionPerEye(int* width, int* height);
void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(const TouchInput &touch), bool haptics, float dp_xscale, float dp_yscale);
@@ -50,7 +50,7 @@ void UpdateVRView(float* leftEye, float* rightEye);
// VR app flow integration
inline bool IsVRBuild() { return false; }
inline void InitVROnAndroid(void* vm, void* activity, const char* system, int version, char* name) {}
inline void InitVROnAndroid(void* vm, void* activity, const char* system, int version, const char* name) {}
inline void EnterVR(bool firstTime, void* vulkanContext) {}
inline void GetVRResolutionPerEye(int* width, int* height) {}
inline void UpdateVRInput(bool(*NativeKey)(const KeyInput &key), bool(*NativeTouch)(const TouchInput &touch), bool haptics, float dp_xscale, float dp_yscale) {}
android/build.gradle
+2
View File
@@ -45,6 +45,8 @@ android {
}
}
compileSdkVersion 32
ndkVersion "21.4.7075529"
defaultConfig {
applicationId 'org.ppsspp.ppsspp'
if (androidGitVersion.name() != "unknown" && androidGitVersion.code() >= 14000000) {
build.gradle
+1 -1
View File
@@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.android.tools.build:gradle:7.3.1'
}
}
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
android.useAndroidX=true
android.enableJetifier=true