gwh/emu48android-linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Version 2.8

Browse source
This commit is contained in:
dgis 2024-10-29 16:03:09 +01:00
parent f71367b05e
commit 03d5beeeed
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ReadMe.txt
View file

@ -58,7 +58,7 @@ LINKS
CHANGES CHANGES
Version 2.8 (2024-xx-xx) Version 2.8 (2024-10-29)
- Updated source code with Emu48 version 1.66+. - Updated source code with Emu48 version 1.66+.
- Fix an USB serial issue with Android 13+ (fix #23). - Fix an USB serial issue with Android 13+ (fix #23).

1
app/CMakeLists.txt
View file

@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.6.0)
project("org.emulator.calculator.EmuApplication") project("org.emulator.calculator.EmuApplication")
#add_compile_options(-DDEBUG_DISPLAY) #add_compile_options(-DDEBUG_DISPLAY)
#add_compile_options(-DDEBUG_SOUND) #add_compile_options(-DDEBUG_SOUND)
#add_compile_options(-DDEBUG_DEBUGGER) #add_compile_options(-DDEBUG_DEBUGGER)

8
app/build.gradle
View file

@ -34,8 +34,8 @@ android {
applicationId "org.emulator.forty.eight" applicationId "org.emulator.forty.eight"
minSdk 21 minSdk 21
targetSdk 34 targetSdk 34
versionCode 26 versionCode 27
versionName "2.7" versionName "2.8"
setProperty("archivesBaseName", "Emu48-v$versionName") setProperty("archivesBaseName", "Emu48-v$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
@ -90,6 +90,6 @@ dependencies {
implementation 'androidx.preference:preference:1.2.1' implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.documentfile:documentfile:1.0.1' implementation 'androidx.documentfile:documentfile:1.0.1'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
} }

2
app/src/main/assets/ReadMe.txt
View file

@ -58,7 +58,7 @@ LINKS
CHANGES CHANGES
Version 2.8 (2024-xx-xx) Version 2.8 (2024-10-29)
- Updated source code with Emu48 version 1.66+. - Updated source code with Emu48 version 1.66+.
- Fix an USB serial issue with Android 13+ (fix #23). - Fix an USB serial issue with Android 13+ (fix #23).

4
app/src/main/cpp/emu-jni.c
View file

@ -88,7 +88,7 @@ enum CALLBACK_TYPE {
}; };
// https://stackoverflow.com/questions/9630134/jni-how-to-callback-from-c-or-c-to-java // https://stackoverflow.com/questions/9630134/jni-how-to-callback-from-c-or-c-to-java
int mainViewCallback(int type, int param1, int param2/*, const TCHAR * param3, const TCHAR * param4*/) { int mainViewCallback(int type, int param1, int param2) {
if (mainActivity) { if (mainActivity) {
JNIEnv *jniEnv = getJNIEnvironment(); JNIEnv *jniEnv = getJNIEnvironment();
if(jniEnv) { if(jniEnv) {
@ -895,7 +895,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_emulator_calculator_NativeLib_getObjects
JNIEXPORT jint JNICALL Java_org_emulator_calculator_NativeLib_onObjectSave(JNIEnv *env, jobject thisz, jstring filename, jbooleanArray objectsToSaveItemChecked) { JNIEXPORT jint JNICALL Java_org_emulator_calculator_NativeLib_onObjectSave(JNIEnv *env, jobject thisz, jstring filename, jbooleanArray objectsToSaveItemChecked) {
const char *filenameUTF8 = (*env)->GetStringUTFChars(env, filename , NULL) ; const char *filenameUTF8 = (*env)->GetStringUTFChars(env, filename , NULL);
if (nState != SM_RUN) if (nState != SM_RUN)
{ {