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

Cleanup and update Win32 background issue.

Browse source
This commit is contained in:
dgis 2024-06-16 15:20:09 +02:00
parent 526b5ef901
commit 1d5bd23e7a
6 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ReadMe.txt
View file

@ -15,7 +15,7 @@ https://github.com/dgis/emu48android
QUICK START 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. 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)). 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. 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: Or in the command line, build the signed APK:
* In the root folder, create a keystore.jks file with: * In the root folder, create a keystore.jks file with:
** keytool -genkey -keystore ./keystore.jks -keyalg RSA -validity 9125 -alias key0 ** 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: * create the file ./keystore.properties , with the following properties:
storeFile=../keystore.jks storeFile=../keystore.jks
storePassword=myPassword storePassword=myPassword

9
app/build.gradle
View file

@ -40,15 +40,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { 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' cppFlags '-std=c++11 -fpermissive -Wno-error=incompatible-pointer-types'
} }
} }
} }
@ -85,7 +77,6 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path file('CMakeLists.txt') path file('CMakeLists.txt')
//version '3.18.1'
} }
} }
ndkVersion '25.1.8937393' ndkVersion '25.1.8937393'

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

@ -15,7 +15,7 @@ https://github.com/dgis/emu48android
QUICK START 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. 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)). 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. 4. And the calculator should now be opened.

2
app/src/main/cpp/win32-layer.c
View file

@ -2315,7 +2315,7 @@ void StretchBltInternal(int xDest, int yDest, int wDest, int hDest,
// black pixels on a white background. // black pixels on a white background.
BYTE * destinationPixel = destinationPixelBase + (x >> 3); BYTE * destinationPixel = destinationPixelBase + (x >> 3);
UINT bitNumber = (UINT) (7 - (x % 8)); UINT bitNumber = (UINT) (7 - (x % 8));
if(backgroundColor == sourceColor) { if((backgroundColor & 0xFFFFFF) == (sourceColor & 0xFFFFFF)) {
*destinationPixel |= (1 << bitNumber); // 1 White *destinationPixel |= (1 << bitNumber); // 1 White
} else { } else {
*destinationPixel &= ~(1 << bitNumber); // 0 Black *destinationPixel &= ~(1 << bitNumber); // 0 Black

1
app/src/main/java/org/emulator/forty/eight/MainActivity.java
View file

@ -1439,7 +1439,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
String romFilename = null; String romFilename = null;
for (DocumentFile file : kmlFolderDocumentFile.listFiles()) { for (DocumentFile file : kmlFolderDocumentFile.listFiles()) {
String name = file.getName(); String name = file.getName();
//if (name != null && name.compareTo(kmlFilename) == 0) {
if (name != null && kmlFilename.contains(name)) { if (name != null && kmlFilename.contains(name)) {
try { try {
DocumentFile documentFile = DocumentFile.fromSingleUri(this, file.getUri()); DocumentFile documentFile = DocumentFile.fromSingleUri(this, file.getUri());

4
build.gradle
View file

@ -27,7 +27,3 @@ allprojects {
} }
} }
} }
//task clean(type: Delete) {
// delete rootProject.buildDir
//}