gwh/droid48-gwh
1
0
Fork 0
Code Pull requests Activity

Tools update and implicit function changes required with newest NDK

Browse source
This commit is contained in:
shagrath 2024-01-08 23:13:15 +01:00
parent 4d2ea840a3
commit dc16f38e75
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -13,7 +13,7 @@ android {
} }
} }
compileSdkVersion 33 compileSdkVersion 33
ndkVersion "25.2.9519653" ndkVersion "26.1.10909125"
defaultConfig { defaultConfig {
applicationId "org.ab.x48" applicationId "org.ab.x48"

3
app/src/main/jni/main.c
View file

@ -70,7 +70,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <fcntl.h> #include <fcntl.h>
#include "x48.h" #include "binio.h"
#include "hp48_emu.h"
#include "hp48.h" #include "hp48.h"
#include "debugger.h" #include "debugger.h"

16
app/src/main/jni/x48.h
View file

@ -177,4 +177,18 @@ extern void XCopyPlane __ProtoType__((Display *dpy, Pixmap map, Window win, GC g
extern void XClearWindow __ProtoType__((Display *dpy, Window win)); extern void XClearWindow __ProtoType__((Display *dpy, Window win));
static pthread_cond_t uiConditionVariable = PTHREAD_COND_INITIALIZER; static pthread_cond_t uiConditionVariable = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t uiConditionMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t uiConditionMutex = PTHREAD_MUTEX_INITIALIZER;
extern int
#ifdef __FunctionProto__
button_pressed(int b);
#else
button_pressed(b);
#endif
extern int
#ifdef __FunctionProto__
button_released(int b);
#else
button_released(b);
#endif

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.1.0' classpath 'com.android.tools.build:gradle:8.2.1'
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Mar 22 21:49:54 CET 2023 #Wed Mar 22 21:49:54 CET 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME