diff --git a/ReadMe.txt b/ReadMe.txt index d8fceff..3c41d2e 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -15,7 +15,7 @@ https://github.com/dgis/emu48android QUICK START -1. From the left side, slide your finger to open the menu. +1. Click on the 3 dots button at the top left (or from the left side, slide your finger to open the menu). 2. Touch the "New..." menu item. 3. Select a default calculator (or "[Select a Custom KML script folder...]" where you have copied the KML scripts and ROM files (Android 11 may not be able to use the Download folder)). 4. And the calculator should now be opened. @@ -304,7 +304,7 @@ Either use Android Studio: Or in the command line, build the signed APK: * In the root folder, create a keystore.jks file with: ** keytool -genkey -keystore ./keystore.jks -keyalg RSA -validity 9125 -alias key0 -** keytool -genkeypair -v -keystore ./keystore.jks -keyalg RSA -validity 9125 -alias key0 +** (or keytool -genkeypair -v -keystore ./keystore.jks -keyalg RSA -validity 9125 -alias key0) * create the file ./keystore.properties , with the following properties: storeFile=../keystore.jks storePassword=myPassword diff --git a/app/build.gradle b/app/build.gradle index 0288189..a82288b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,15 +40,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { -// cppFlags '-std=c++11' -// cppFlags '-std=gnu99' -// cppFlags '-std=c99' -// cppFlags '-std=c++11 -std=gnu99' - -// cppFlags '-std=c++11 -Wno-error=implicit-function-declaration' -// add_compile_options(-fpermissive) cppFlags '-std=c++11 -fpermissive -Wno-error=incompatible-pointer-types' - } } } @@ -85,7 +77,6 @@ android { externalNativeBuild { cmake { path file('CMakeLists.txt') - //version '3.18.1' } } ndkVersion '25.1.8937393' diff --git a/app/src/main/assets/ReadMe.txt b/app/src/main/assets/ReadMe.txt index 085f397..71490fd 100644 --- a/app/src/main/assets/ReadMe.txt +++ b/app/src/main/assets/ReadMe.txt @@ -15,7 +15,7 @@ https://github.com/dgis/emu48android QUICK START -1. From the left side, slide your finger to open the menu. +1. Click on the 3 dots button at the top left (or from the left side, slide your finger to open the menu). 2. Touch the "New..." menu item. 3. Select a default calculator (or "[Select a Custom KML script folder...]" where you have copied the KML scripts and ROM files (Android 11 may not be able to use the Download folder)). 4. And the calculator should now be opened. diff --git a/app/src/main/cpp/win32-layer.c b/app/src/main/cpp/win32-layer.c index d293411..7edb8c1 100644 --- a/app/src/main/cpp/win32-layer.c +++ b/app/src/main/cpp/win32-layer.c @@ -2315,7 +2315,7 @@ void StretchBltInternal(int xDest, int yDest, int wDest, int hDest, // black pixels on a white background. BYTE * destinationPixel = destinationPixelBase + (x >> 3); UINT bitNumber = (UINT) (7 - (x % 8)); - if(backgroundColor == sourceColor) { + if((backgroundColor & 0xFFFFFF) == (sourceColor & 0xFFFFFF)) { *destinationPixel |= (1 << bitNumber); // 1 White } else { *destinationPixel &= ~(1 << bitNumber); // 0 Black diff --git a/app/src/main/java/org/emulator/forty/eight/MainActivity.java b/app/src/main/java/org/emulator/forty/eight/MainActivity.java index c82a75b..f72b2d5 100644 --- a/app/src/main/java/org/emulator/forty/eight/MainActivity.java +++ b/app/src/main/java/org/emulator/forty/eight/MainActivity.java @@ -1439,7 +1439,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On String romFilename = null; for (DocumentFile file : kmlFolderDocumentFile.listFiles()) { String name = file.getName(); - //if (name != null && name.compareTo(kmlFilename) == 0) { if (name != null && kmlFilename.contains(name)) { try { DocumentFile documentFile = DocumentFile.fromSingleUri(this, file.getUri()); diff --git a/build.gradle b/build.gradle index 48f755b..bf9b331 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,3 @@ allprojects { } } } - -//task clean(type: Delete) { -// delete rootProject.buildDir -//}