From aa2b64ce30cddb0f074d03e89bf34ea14d79c9aa Mon Sep 17 00:00:00 2001 From: offtkp Date: Sun, 17 Dec 2023 18:19:37 +0200 Subject: [PATCH] [Cloud]Generic cleanups --- .github/workflows/deploy_win.yml | 2 +- .gitignore | 2 +- CMakeLists.txt | 1 + src/ios_support.h | 1 - src/localization.c | 3 +++ .../src/main/java/com/sky/SkyEmu/EnhancedNativeActivity.java | 1 - 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_win.yml b/.github/workflows/deploy_win.yml index f32d7d7a0..8a40f3dd5 100644 --- a/.github/workflows/deploy_win.yml +++ b/.github/workflows/deploy_win.yml @@ -9,7 +9,7 @@ jobs: - name: Get latest CMake and ninja # Using 'latest' branch, the most recent CMake and ninja are installed. uses: lukka/get-cmake@latest - + - name: Build 🔧 run: | mkdir build diff --git a/.gitignore b/.gitignore index 3863750dc..b0c2decbb 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,4 @@ cmake-build-*/ .idea/ .gradle .google -tools/android_project/app/release \ No newline at end of file +tools/android_project/app/release diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ef9d38cd..cccf1fad7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ else() project(SkyEmu C CXX) endif() + set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 11) set(LINK_LIBS "") diff --git a/src/ios_support.h b/src/ios_support.h index b211d27c7..3f68f734c 100644 --- a/src/ios_support.h +++ b/src/ios_support.h @@ -5,5 +5,4 @@ void se_ios_open_file_picker( int num_extensions, const char ** extensions); void se_ios_get_safe_ui_padding(float *top, float* bottom,float* left, float *right); void se_ios_set_documents_working_directory(); void se_ios_open_url(const char * url); -const char* se_ios_get_certificate_path(); #endif diff --git a/src/localization.c b/src/localization.c index 1b47f33b2..ee6db8d5c 100644 --- a/src/localization.c +++ b/src/localization.c @@ -19,6 +19,9 @@ // Strings added in v4 requiring translation: // - "Disabled in Hardcore Mode" +// - "Rewind" +// - "Slow" +// - "Fast Forward" //#define SHOW_TRANSLATE_ME 1 diff --git a/tools/android_project/app/src/main/java/com/sky/SkyEmu/EnhancedNativeActivity.java b/tools/android_project/app/src/main/java/com/sky/SkyEmu/EnhancedNativeActivity.java index 73bbb1b44..3af59837c 100644 --- a/tools/android_project/app/src/main/java/com/sky/SkyEmu/EnhancedNativeActivity.java +++ b/tools/android_project/app/src/main/java/com/sky/SkyEmu/EnhancedNativeActivity.java @@ -49,7 +49,6 @@ public class EnhancedNativeActivity extends NativeActivity { public View mRootView; private Vector keyboardEvents; private boolean first_event; - private String certificatePath; static { System.loadLibrary("SkyEmu");