Skip to content

Commit 9d4fc22

Browse files
committed
release 6.1
2 parents 548f717 + ef41498 commit 9d4fc22

File tree

23 files changed

+105
-47
lines changed

23 files changed

+105
-47
lines changed

.github/workflows/windows-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,29 @@ jobs:
3232
- name: Build pfbneo
3333
run: |
3434
mkdir cmake-build-pfbneo && cd cmake-build-pfbneo
35-
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Debug ..
35+
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pfbneo -DCMAKE_BUILD_TYPE=Release ..
3636
make pfbneo.deps
3737
make pfbneo_windows_release
3838
mv *.zip $GITHUB_WORKSPACE
3939
4040
- name: Build pgen
4141
run: |
4242
mkdir cmake-build-pgen && cd cmake-build-pgen
43-
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Debug ..
43+
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pgen -DCMAKE_BUILD_TYPE=Release ..
4444
make pgen_windows_release
4545
mv *.zip $GITHUB_WORKSPACE
4646
4747
- name: Build pnes
4848
run: |
4949
mkdir cmake-build-pnes && cd cmake-build-pnes
50-
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Debug ..
50+
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=pnes -DCMAKE_BUILD_TYPE=Release ..
5151
make pnes_windows_release
5252
mv *.zip $GITHUB_WORKSPACE
5353
5454
- name: Build psnes
5555
run: |
5656
mkdir cmake-build-psnes && cd cmake-build-psnes
57-
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Debug ..
57+
cmake -G "MSYS Makefiles" -DPLATFORM_WINDOWS=ON -DOPTION_EMU=psnes -DCMAKE_BUILD_TYPE=Release ..
5858
make psnes_windows_release
5959
mv *.zip $GITHUB_WORKSPACE
6060

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
cmake-build*
2-
build*
32
.idea
43
ss_dev_id.key
54
ss_dev_pwd.key

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ add_subdirectory(sscrap)
3030
project(pemu)
3131
set(PROJECT_AUTHOR cpasjuste)
3232
set(VERSION_MAJOR 6)
33-
set(VERSION_MINOR 0)
33+
set(VERSION_MINOR 1)
3434

3535
# pemu (ui)
3636
add_subdirectory(ui)

android/app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
/release

android/app/build.gradle

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
plugins {
2+
id 'com.android.application'
3+
}
4+
5+
android {
6+
compileSdk 32
7+
8+
defaultConfig {
9+
applicationId "fr.mydedibox.pemu"
10+
minSdk 26
11+
targetSdk 32
12+
versionCode 1
13+
versionName "1.0"
14+
15+
ndk {
16+
abiFilters 'arm64-v8a'
17+
}
18+
19+
externalNativeBuild {
20+
cmake {
21+
cppFlags '-std=c++17'
22+
arguments "-DPLATFORM_ANDROID=ON", "-DANDROID_ASSETS_PATH=${sourceSets.main.assets.srcDirs[0]}", "-DOPTION_EMU=psnes"
23+
}
24+
}
25+
}
26+
27+
buildTypes {
28+
release {
29+
minifyEnabled false
30+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
31+
}
32+
}
33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_1_8
35+
targetCompatibility JavaVersion.VERSION_1_8
36+
}
37+
externalNativeBuild {
38+
cmake {
39+
path file('../../CMakeLists.txt')
40+
version '3.18.1'
41+
}
42+
}
43+
buildFeatures {
44+
viewBinding true
45+
}
46+
}
47+
48+
dependencies {
49+
50+
implementation 'androidx.appcompat:appcompat:1.4.1'
51+
implementation 'com.google.android.material:material:1.5.0'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
53+
}

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="fr.mydedibox.libcross2d_template"
3+
package="fr.mydedibox.pemu"
44
android:installLocation="auto">
55

66
<!-- OpenGL ES 2.0 -->
@@ -39,7 +39,7 @@
3939
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
4040

4141
<activity
42-
android:name="fr.mydedibox.libcross2d.Main"
42+
android:name="fr.mydedibox.pemu.Main"
4343
android:alwaysRetainTaskState="true"
4444
android:configChanges="layoutDirection|locale|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
4545
android:exported="true"

android/app/src/main/java/fr/mydedibox/libcross2d/Main.java renamed to android/app/src/main/java/fr/mydedibox/pemu/Main.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package fr.mydedibox.libcross2d;
1+
package fr.mydedibox.pemu;
22

33
import android.os.Bundle;
44
import android.os.Environment;
55
import android.util.Log;
6-
import android.view.MotionEvent;
76

87
import java.io.BufferedReader;
98
import java.io.File;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">Game</string>
2+
<string name="app_name">pEMU</string>
33
</resources>

android/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
plugins {
3+
id 'com.android.application' version '7.1.3' apply false
4+
id 'com.android.library' version '7.1.3' apply false
5+
}
6+
7+
task clean(type: Delete) {
8+
delete rootProject.buildDir
9+
}
2.67 MB
Binary file not shown.

0 commit comments

Comments
 (0)