From b21cd1e3d936f195f4402822232c925d60c80435 Mon Sep 17 00:00:00 2001 From: Michel Heily Date: Fri, 10 Apr 2020 00:51:23 +0300 Subject: [PATCH] Refactor project workspace and fix build Former-commit-id: 8e264cdbc9e5290654c29e6893a121bce73c29c9 --- Cargo.toml | 6 +++--- .../rustboyadvance-jni}/Cargo.toml | 2 +- .../rustboyadvance-jni}/src/lib.rs | 0 .../rustboyadvance-jni}/src/rom_helper.rs | 0 {AndroidApp => platform/android}/.gitignore | 0 {AndroidApp => platform/android}/.idea/.name | 0 .../android}/.idea/codeStyles/Project.xml | 0 {AndroidApp => platform/android}/.idea/gradle.xml | 0 {AndroidApp => platform/android}/.idea/misc.xml | 0 .../android}/.idea/runConfigurations.xml | 0 {AndroidApp => platform/android}/.idea/vcs.xml | 0 {AndroidApp => platform/android}/README.md | 0 {AndroidApp => platform/android}/app/.gitignore | 0 {AndroidApp => platform/android}/app/build.gradle | 2 +- .../android}/app/proguard-rules.pro | 0 .../rustdroid_emu/ExampleInstrumentedTest.java | 0 .../android}/app/src/main/AndroidManifest.xml | 0 .../mrmichel/rustboyadvance/EmulatorBindings.java | 0 .../java/com/mrmichel/rustboyadvance/RomHelper.java | 0 .../main/java/com/mrmichel/rustdroid_emu/Util.java | 0 .../mrmichel/rustdroid_emu/core/AudioThread.java | 0 .../com/mrmichel/rustdroid_emu/core/Emulator.java | 0 .../com/mrmichel/rustdroid_emu/core/Keypad.java | 0 .../com/mrmichel/rustdroid_emu/core/RomManager.java | 0 .../com/mrmichel/rustdroid_emu/core/Snapshot.java | 0 .../rustdroid_emu/core/SnapshotManager.java | 0 .../mrmichel/rustdroid_emu/ui/EmulationThread.java | 0 .../mrmichel/rustdroid_emu/ui/EmulatorActivity.java | 0 .../mrmichel/rustdroid_emu/ui/ScreenRenderer.java | 0 .../com/mrmichel/rustdroid_emu/ui/ScreenView.java | 0 .../mrmichel/rustdroid_emu/ui/SettingsActivity.java | 0 .../mrmichel/rustdroid_emu/ui/SettingsFragment.java | 0 .../mrmichel/rustdroid_emu/ui/SplashActivity.java | 0 .../rustdroid_emu/ui/library/RomListActivity.java | 0 .../ui/library/RomListItemAdapter.java | 0 .../ui/snapshots/ISnapshotListener.java | 0 .../ui/snapshots/SnapshotItemAdapter.java | 0 .../ui/snapshots/SnapshotListFragment.java | 0 .../ui/snapshots/SnapshotPickerActivity.java | 0 .../res/drawable-v24/ic_launcher_foreground.xml | 0 .../main/res/drawable/ic_launcher_background.xml | 0 .../android}/app/src/main/res/drawable/icon.png | Bin .../app/src/main/res/drawable/round_button.xml | 0 .../src/main/res/layout-land/activity_emulator.xml | 0 .../src/main/res/layout-land/content_emulator.xml | 0 .../app/src/main/res/layout/activity_emulator.xml | 0 .../app/src/main/res/layout/activity_rom_list.xml | 0 .../app/src/main/res/layout/activity_settings.xml | 0 .../app/src/main/res/layout/content_emulator.xml | 0 .../app/src/main/res/layout/content_rom_list.xml | 0 .../android}/app/src/main/res/layout/dpad.xml | 0 .../android}/app/src/main/res/layout/rom_item.xml | 0 .../app/src/main/res/layout/snapshot_item.xml | 0 .../src/main/res/layout/snapshot_list_fragment.xml | 0 .../main/res/layout/snapshot_picker_activity.xml | 0 .../app/src/main/res/layout/splash_activity.xml | 0 .../app/src/main/res/menu/menu_context_rom.xml | 0 .../app/src/main/res/menu/menu_context_snapshot.xml | 0 .../app/src/main/res/menu/menu_emulator.xml | 0 .../app/src/main/res/menu/menu_rom_list.xml | 0 .../app/src/main/res/menu/menu_snapshot.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin ...en_texture_color_correction_fragment_shader.glsl | 0 .../res/raw/screen_texture_fragment_shader.glsl | 0 .../main/res/raw/screen_texture_vertex_shader.glsl | 0 .../android}/app/src/main/res/values/colors.xml | 0 .../android}/app/src/main/res/values/dimens.xml | 0 .../android}/app/src/main/res/values/strings.xml | 0 .../android}/app/src/main/res/values/styles.xml | 0 .../app/src/main/res/xml/app_preferences.xml | 0 .../com/mrmichel/rustdroid_emu/ExampleUnitTest.java | 0 {AndroidApp => platform/android}/build.gradle | 0 {AndroidApp => platform/android}/gradle.properties | 0 .../android}/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {AndroidApp => platform/android}/gradlew | 0 {AndroidApp => platform/android}/gradlew.bat | 0 {AndroidApp => platform/android}/settings.gradle | 0 .../rustboyadvance-minifb}/Cargo.toml | 2 +- .../rustboyadvance-minifb}/src/cli.yml | 0 .../rustboyadvance-minifb}/src/main.rs | 0 .../rustboyadvance-sdl2}/Cargo.toml | 2 +- .../rustboyadvance-sdl2}/build.rs | 2 +- .../rustboyadvance-sdl2}/src/audio.rs | 0 .../rustboyadvance-sdl2}/src/cli.yml | 0 .../rustboyadvance-sdl2}/src/input.rs | 0 .../rustboyadvance-sdl2}/src/main.rs | 0 .../rustboyadvance-sdl2}/src/video.rs | 0 src/core/gba.rs | 2 ++ 100 files changed, 10 insertions(+), 8 deletions(-) rename {rustboyadvance-jni => bindings/rustboyadvance-jni}/Cargo.toml (93%) rename {rustboyadvance-jni => bindings/rustboyadvance-jni}/src/lib.rs (100%) rename {rustboyadvance-jni => bindings/rustboyadvance-jni}/src/rom_helper.rs (100%) rename {AndroidApp => platform/android}/.gitignore (100%) rename {AndroidApp => platform/android}/.idea/.name (100%) rename {AndroidApp => platform/android}/.idea/codeStyles/Project.xml (100%) rename {AndroidApp => platform/android}/.idea/gradle.xml (100%) rename {AndroidApp => platform/android}/.idea/misc.xml (100%) rename {AndroidApp => platform/android}/.idea/runConfigurations.xml (100%) rename {AndroidApp => platform/android}/.idea/vcs.xml (100%) rename {AndroidApp => platform/android}/README.md (100%) rename {AndroidApp => platform/android}/app/.gitignore (100%) rename {AndroidApp => platform/android}/app/build.gradle (94%) rename {AndroidApp => platform/android}/app/proguard-rules.pro (100%) rename {AndroidApp => platform/android}/app/src/androidTest/java/com/mrmichel/rustdroid_emu/ExampleInstrumentedTest.java (100%) rename {AndroidApp => platform/android}/app/src/main/AndroidManifest.xml (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustboyadvance/EmulatorBindings.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustboyadvance/RomHelper.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/Util.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/AudioThread.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/Emulator.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/Keypad.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/RomManager.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/Snapshot.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/core/SnapshotManager.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulationThread.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenRenderer.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenView.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsActivity.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsFragment.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SplashActivity.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListActivity.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/ISnapshotListener.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotItemAdapter.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotListFragment.java (100%) rename {AndroidApp => platform/android}/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotPickerActivity.java (100%) rename {AndroidApp => platform/android}/app/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/drawable/icon.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/drawable/round_button.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout-land/activity_emulator.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout-land/content_emulator.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/activity_emulator.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/activity_rom_list.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/activity_settings.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/content_emulator.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/content_rom_list.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/dpad.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/rom_item.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/snapshot_item.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/snapshot_list_fragment.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/snapshot_picker_activity.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/layout/splash_activity.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/menu/menu_context_rom.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/menu/menu_context_snapshot.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/menu/menu_emulator.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/menu/menu_rom_list.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/menu/menu_snapshot.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {AndroidApp => platform/android}/app/src/main/res/raw/screen_texture_color_correction_fragment_shader.glsl (100%) rename {AndroidApp => platform/android}/app/src/main/res/raw/screen_texture_fragment_shader.glsl (100%) rename {AndroidApp => platform/android}/app/src/main/res/raw/screen_texture_vertex_shader.glsl (100%) rename {AndroidApp => platform/android}/app/src/main/res/values/colors.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/values/dimens.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/values/strings.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/values/styles.xml (100%) rename {AndroidApp => platform/android}/app/src/main/res/xml/app_preferences.xml (100%) rename {AndroidApp => platform/android}/app/src/test/java/com/mrmichel/rustdroid_emu/ExampleUnitTest.java (100%) rename {AndroidApp => platform/android}/build.gradle (100%) rename {AndroidApp => platform/android}/gradle.properties (100%) rename {AndroidApp => platform/android}/gradle/wrapper/gradle-wrapper.jar (100%) rename {AndroidApp => platform/android}/gradle/wrapper/gradle-wrapper.properties (100%) rename {AndroidApp => platform/android}/gradlew (100%) rename {AndroidApp => platform/android}/gradlew.bat (100%) rename {AndroidApp => platform/android}/settings.gradle (100%) rename {rustboyadvance-minifb => platform/rustboyadvance-minifb}/Cargo.toml (85%) rename {rustboyadvance-minifb => platform/rustboyadvance-minifb}/src/cli.yml (100%) rename {rustboyadvance-minifb => platform/rustboyadvance-minifb}/src/main.rs (100%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/Cargo.toml (94%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/build.rs (80%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/src/audio.rs (100%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/src/cli.yml (100%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/src/input.rs (100%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/src/main.rs (100%) rename {rustboyadvance-sdl2 => platform/rustboyadvance-sdl2}/src/video.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 340fc8c..70c1a3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" [workspace] members = [ - "rustboyadvance-sdl2", - "rustboyadvance-minifb", - "rustboyadvance-jni", + "platform/rustboyadvance-sdl2", + "platform/rustboyadvance-minifb", + "bindings/rustboyadvance-jni", ] [dependencies] diff --git a/rustboyadvance-jni/Cargo.toml b/bindings/rustboyadvance-jni/Cargo.toml similarity index 93% rename from rustboyadvance-jni/Cargo.toml rename to bindings/rustboyadvance-jni/Cargo.toml index a6bf180..5c49f34 100644 --- a/rustboyadvance-jni/Cargo.toml +++ b/bindings/rustboyadvance-jni/Cargo.toml @@ -10,7 +10,7 @@ publish = false crate-type = ["staticlib", "cdylib"] [dependencies] -rustboyadvance-ng = {path = "../"} +rustboyadvance-ng = {path = "../../"} jni = { version = "0.14", default-features = false } log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]} ringbuf = "0.2.1" diff --git a/rustboyadvance-jni/src/lib.rs b/bindings/rustboyadvance-jni/src/lib.rs similarity index 100% rename from rustboyadvance-jni/src/lib.rs rename to bindings/rustboyadvance-jni/src/lib.rs diff --git a/rustboyadvance-jni/src/rom_helper.rs b/bindings/rustboyadvance-jni/src/rom_helper.rs similarity index 100% rename from rustboyadvance-jni/src/rom_helper.rs rename to bindings/rustboyadvance-jni/src/rom_helper.rs diff --git a/AndroidApp/.gitignore b/platform/android/.gitignore similarity index 100% rename from AndroidApp/.gitignore rename to platform/android/.gitignore diff --git a/AndroidApp/.idea/.name b/platform/android/.idea/.name similarity index 100% rename from AndroidApp/.idea/.name rename to platform/android/.idea/.name diff --git a/AndroidApp/.idea/codeStyles/Project.xml b/platform/android/.idea/codeStyles/Project.xml similarity index 100% rename from AndroidApp/.idea/codeStyles/Project.xml rename to platform/android/.idea/codeStyles/Project.xml diff --git a/AndroidApp/.idea/gradle.xml b/platform/android/.idea/gradle.xml similarity index 100% rename from AndroidApp/.idea/gradle.xml rename to platform/android/.idea/gradle.xml diff --git a/AndroidApp/.idea/misc.xml b/platform/android/.idea/misc.xml similarity index 100% rename from AndroidApp/.idea/misc.xml rename to platform/android/.idea/misc.xml diff --git a/AndroidApp/.idea/runConfigurations.xml b/platform/android/.idea/runConfigurations.xml similarity index 100% rename from AndroidApp/.idea/runConfigurations.xml rename to platform/android/.idea/runConfigurations.xml diff --git a/AndroidApp/.idea/vcs.xml b/platform/android/.idea/vcs.xml similarity index 100% rename from AndroidApp/.idea/vcs.xml rename to platform/android/.idea/vcs.xml diff --git a/AndroidApp/README.md b/platform/android/README.md similarity index 100% rename from AndroidApp/README.md rename to platform/android/README.md diff --git a/AndroidApp/app/.gitignore b/platform/android/app/.gitignore similarity index 100% rename from AndroidApp/app/.gitignore rename to platform/android/app/.gitignore diff --git a/AndroidApp/app/build.gradle b/platform/android/app/build.gradle similarity index 94% rename from AndroidApp/app/build.gradle rename to platform/android/app/build.gradle index e1b8c49..fddba6e 100644 --- a/AndroidApp/app/build.gradle +++ b/platform/android/app/build.gradle @@ -25,7 +25,7 @@ cargo { prebuiltToolchains = true verbose = true profile = 'release' - module = "../../rustboyadvance-jni" + module = "../../bindings/rustboyadvance-jni" targetDirectory = '../../target' libname = "rustboyadvance_jni" targets = ['x86', 'arm64'] diff --git a/AndroidApp/app/proguard-rules.pro b/platform/android/app/proguard-rules.pro similarity index 100% rename from AndroidApp/app/proguard-rules.pro rename to platform/android/app/proguard-rules.pro diff --git a/AndroidApp/app/src/androidTest/java/com/mrmichel/rustdroid_emu/ExampleInstrumentedTest.java b/platform/android/app/src/androidTest/java/com/mrmichel/rustdroid_emu/ExampleInstrumentedTest.java similarity index 100% rename from AndroidApp/app/src/androidTest/java/com/mrmichel/rustdroid_emu/ExampleInstrumentedTest.java rename to platform/android/app/src/androidTest/java/com/mrmichel/rustdroid_emu/ExampleInstrumentedTest.java diff --git a/AndroidApp/app/src/main/AndroidManifest.xml b/platform/android/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidApp/app/src/main/AndroidManifest.xml rename to platform/android/app/src/main/AndroidManifest.xml diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustboyadvance/EmulatorBindings.java b/platform/android/app/src/main/java/com/mrmichel/rustboyadvance/EmulatorBindings.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustboyadvance/EmulatorBindings.java rename to platform/android/app/src/main/java/com/mrmichel/rustboyadvance/EmulatorBindings.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustboyadvance/RomHelper.java b/platform/android/app/src/main/java/com/mrmichel/rustboyadvance/RomHelper.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustboyadvance/RomHelper.java rename to platform/android/app/src/main/java/com/mrmichel/rustboyadvance/RomHelper.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/Util.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/Util.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/Util.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/Util.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/AudioThread.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/AudioThread.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/AudioThread.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/AudioThread.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Emulator.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Emulator.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Emulator.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Emulator.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Keypad.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Keypad.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Keypad.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Keypad.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/RomManager.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/RomManager.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/RomManager.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/RomManager.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Snapshot.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Snapshot.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/Snapshot.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/Snapshot.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/SnapshotManager.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/SnapshotManager.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/core/SnapshotManager.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/core/SnapshotManager.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulationThread.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulationThread.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulationThread.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulationThread.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenRenderer.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenRenderer.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenRenderer.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenRenderer.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenView.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenView.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenView.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/ScreenView.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsActivity.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsActivity.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsActivity.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsFragment.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsFragment.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsFragment.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SettingsFragment.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SplashActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SplashActivity.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SplashActivity.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/SplashActivity.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListActivity.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListActivity.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListActivity.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/ISnapshotListener.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/ISnapshotListener.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/ISnapshotListener.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/ISnapshotListener.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotItemAdapter.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotItemAdapter.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotItemAdapter.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotItemAdapter.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotListFragment.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotListFragment.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotListFragment.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotListFragment.java diff --git a/AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotPickerActivity.java b/platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotPickerActivity.java similarity index 100% rename from AndroidApp/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotPickerActivity.java rename to platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/snapshots/SnapshotPickerActivity.java diff --git a/AndroidApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/platform/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from AndroidApp/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to platform/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/AndroidApp/app/src/main/res/drawable/ic_launcher_background.xml b/platform/android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from AndroidApp/app/src/main/res/drawable/ic_launcher_background.xml rename to platform/android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/AndroidApp/app/src/main/res/drawable/icon.png b/platform/android/app/src/main/res/drawable/icon.png similarity index 100% rename from AndroidApp/app/src/main/res/drawable/icon.png rename to platform/android/app/src/main/res/drawable/icon.png diff --git a/AndroidApp/app/src/main/res/drawable/round_button.xml b/platform/android/app/src/main/res/drawable/round_button.xml similarity index 100% rename from AndroidApp/app/src/main/res/drawable/round_button.xml rename to platform/android/app/src/main/res/drawable/round_button.xml diff --git a/AndroidApp/app/src/main/res/layout-land/activity_emulator.xml b/platform/android/app/src/main/res/layout-land/activity_emulator.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout-land/activity_emulator.xml rename to platform/android/app/src/main/res/layout-land/activity_emulator.xml diff --git a/AndroidApp/app/src/main/res/layout-land/content_emulator.xml b/platform/android/app/src/main/res/layout-land/content_emulator.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout-land/content_emulator.xml rename to platform/android/app/src/main/res/layout-land/content_emulator.xml diff --git a/AndroidApp/app/src/main/res/layout/activity_emulator.xml b/platform/android/app/src/main/res/layout/activity_emulator.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/activity_emulator.xml rename to platform/android/app/src/main/res/layout/activity_emulator.xml diff --git a/AndroidApp/app/src/main/res/layout/activity_rom_list.xml b/platform/android/app/src/main/res/layout/activity_rom_list.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/activity_rom_list.xml rename to platform/android/app/src/main/res/layout/activity_rom_list.xml diff --git a/AndroidApp/app/src/main/res/layout/activity_settings.xml b/platform/android/app/src/main/res/layout/activity_settings.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/activity_settings.xml rename to platform/android/app/src/main/res/layout/activity_settings.xml diff --git a/AndroidApp/app/src/main/res/layout/content_emulator.xml b/platform/android/app/src/main/res/layout/content_emulator.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/content_emulator.xml rename to platform/android/app/src/main/res/layout/content_emulator.xml diff --git a/AndroidApp/app/src/main/res/layout/content_rom_list.xml b/platform/android/app/src/main/res/layout/content_rom_list.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/content_rom_list.xml rename to platform/android/app/src/main/res/layout/content_rom_list.xml diff --git a/AndroidApp/app/src/main/res/layout/dpad.xml b/platform/android/app/src/main/res/layout/dpad.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/dpad.xml rename to platform/android/app/src/main/res/layout/dpad.xml diff --git a/AndroidApp/app/src/main/res/layout/rom_item.xml b/platform/android/app/src/main/res/layout/rom_item.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/rom_item.xml rename to platform/android/app/src/main/res/layout/rom_item.xml diff --git a/AndroidApp/app/src/main/res/layout/snapshot_item.xml b/platform/android/app/src/main/res/layout/snapshot_item.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/snapshot_item.xml rename to platform/android/app/src/main/res/layout/snapshot_item.xml diff --git a/AndroidApp/app/src/main/res/layout/snapshot_list_fragment.xml b/platform/android/app/src/main/res/layout/snapshot_list_fragment.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/snapshot_list_fragment.xml rename to platform/android/app/src/main/res/layout/snapshot_list_fragment.xml diff --git a/AndroidApp/app/src/main/res/layout/snapshot_picker_activity.xml b/platform/android/app/src/main/res/layout/snapshot_picker_activity.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/snapshot_picker_activity.xml rename to platform/android/app/src/main/res/layout/snapshot_picker_activity.xml diff --git a/AndroidApp/app/src/main/res/layout/splash_activity.xml b/platform/android/app/src/main/res/layout/splash_activity.xml similarity index 100% rename from AndroidApp/app/src/main/res/layout/splash_activity.xml rename to platform/android/app/src/main/res/layout/splash_activity.xml diff --git a/AndroidApp/app/src/main/res/menu/menu_context_rom.xml b/platform/android/app/src/main/res/menu/menu_context_rom.xml similarity index 100% rename from AndroidApp/app/src/main/res/menu/menu_context_rom.xml rename to platform/android/app/src/main/res/menu/menu_context_rom.xml diff --git a/AndroidApp/app/src/main/res/menu/menu_context_snapshot.xml b/platform/android/app/src/main/res/menu/menu_context_snapshot.xml similarity index 100% rename from AndroidApp/app/src/main/res/menu/menu_context_snapshot.xml rename to platform/android/app/src/main/res/menu/menu_context_snapshot.xml diff --git a/AndroidApp/app/src/main/res/menu/menu_emulator.xml b/platform/android/app/src/main/res/menu/menu_emulator.xml similarity index 100% rename from AndroidApp/app/src/main/res/menu/menu_emulator.xml rename to platform/android/app/src/main/res/menu/menu_emulator.xml diff --git a/AndroidApp/app/src/main/res/menu/menu_rom_list.xml b/platform/android/app/src/main/res/menu/menu_rom_list.xml similarity index 100% rename from AndroidApp/app/src/main/res/menu/menu_rom_list.xml rename to platform/android/app/src/main/res/menu/menu_rom_list.xml diff --git a/AndroidApp/app/src/main/res/menu/menu_snapshot.xml b/platform/android/app/src/main/res/menu/menu_snapshot.xml similarity index 100% rename from AndroidApp/app/src/main/res/menu/menu_snapshot.xml rename to platform/android/app/src/main/res/menu/menu_snapshot.xml diff --git a/AndroidApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/platform/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to platform/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/AndroidApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/platform/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to platform/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/AndroidApp/app/src/main/res/mipmap-hdpi/ic_launcher.png b/platform/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to platform/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/AndroidApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/platform/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to platform/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/AndroidApp/app/src/main/res/mipmap-mdpi/ic_launcher.png b/platform/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to platform/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/AndroidApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/platform/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to platform/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/AndroidApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/platform/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to platform/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/AndroidApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/platform/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to platform/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/AndroidApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/platform/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to platform/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/AndroidApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/platform/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to platform/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/AndroidApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/platform/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to platform/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/AndroidApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/platform/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from AndroidApp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to platform/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/AndroidApp/app/src/main/res/raw/screen_texture_color_correction_fragment_shader.glsl b/platform/android/app/src/main/res/raw/screen_texture_color_correction_fragment_shader.glsl similarity index 100% rename from AndroidApp/app/src/main/res/raw/screen_texture_color_correction_fragment_shader.glsl rename to platform/android/app/src/main/res/raw/screen_texture_color_correction_fragment_shader.glsl diff --git a/AndroidApp/app/src/main/res/raw/screen_texture_fragment_shader.glsl b/platform/android/app/src/main/res/raw/screen_texture_fragment_shader.glsl similarity index 100% rename from AndroidApp/app/src/main/res/raw/screen_texture_fragment_shader.glsl rename to platform/android/app/src/main/res/raw/screen_texture_fragment_shader.glsl diff --git a/AndroidApp/app/src/main/res/raw/screen_texture_vertex_shader.glsl b/platform/android/app/src/main/res/raw/screen_texture_vertex_shader.glsl similarity index 100% rename from AndroidApp/app/src/main/res/raw/screen_texture_vertex_shader.glsl rename to platform/android/app/src/main/res/raw/screen_texture_vertex_shader.glsl diff --git a/AndroidApp/app/src/main/res/values/colors.xml b/platform/android/app/src/main/res/values/colors.xml similarity index 100% rename from AndroidApp/app/src/main/res/values/colors.xml rename to platform/android/app/src/main/res/values/colors.xml diff --git a/AndroidApp/app/src/main/res/values/dimens.xml b/platform/android/app/src/main/res/values/dimens.xml similarity index 100% rename from AndroidApp/app/src/main/res/values/dimens.xml rename to platform/android/app/src/main/res/values/dimens.xml diff --git a/AndroidApp/app/src/main/res/values/strings.xml b/platform/android/app/src/main/res/values/strings.xml similarity index 100% rename from AndroidApp/app/src/main/res/values/strings.xml rename to platform/android/app/src/main/res/values/strings.xml diff --git a/AndroidApp/app/src/main/res/values/styles.xml b/platform/android/app/src/main/res/values/styles.xml similarity index 100% rename from AndroidApp/app/src/main/res/values/styles.xml rename to platform/android/app/src/main/res/values/styles.xml diff --git a/AndroidApp/app/src/main/res/xml/app_preferences.xml b/platform/android/app/src/main/res/xml/app_preferences.xml similarity index 100% rename from AndroidApp/app/src/main/res/xml/app_preferences.xml rename to platform/android/app/src/main/res/xml/app_preferences.xml diff --git a/AndroidApp/app/src/test/java/com/mrmichel/rustdroid_emu/ExampleUnitTest.java b/platform/android/app/src/test/java/com/mrmichel/rustdroid_emu/ExampleUnitTest.java similarity index 100% rename from AndroidApp/app/src/test/java/com/mrmichel/rustdroid_emu/ExampleUnitTest.java rename to platform/android/app/src/test/java/com/mrmichel/rustdroid_emu/ExampleUnitTest.java diff --git a/AndroidApp/build.gradle b/platform/android/build.gradle similarity index 100% rename from AndroidApp/build.gradle rename to platform/android/build.gradle diff --git a/AndroidApp/gradle.properties b/platform/android/gradle.properties similarity index 100% rename from AndroidApp/gradle.properties rename to platform/android/gradle.properties diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.jar b/platform/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from AndroidApp/gradle/wrapper/gradle-wrapper.jar rename to platform/android/gradle/wrapper/gradle-wrapper.jar diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from AndroidApp/gradle/wrapper/gradle-wrapper.properties rename to platform/android/gradle/wrapper/gradle-wrapper.properties diff --git a/AndroidApp/gradlew b/platform/android/gradlew similarity index 100% rename from AndroidApp/gradlew rename to platform/android/gradlew diff --git a/AndroidApp/gradlew.bat b/platform/android/gradlew.bat similarity index 100% rename from AndroidApp/gradlew.bat rename to platform/android/gradlew.bat diff --git a/AndroidApp/settings.gradle b/platform/android/settings.gradle similarity index 100% rename from AndroidApp/settings.gradle rename to platform/android/settings.gradle diff --git a/rustboyadvance-minifb/Cargo.toml b/platform/rustboyadvance-minifb/Cargo.toml similarity index 85% rename from rustboyadvance-minifb/Cargo.toml rename to platform/rustboyadvance-minifb/Cargo.toml index 6ee9572..6564344 100644 --- a/rustboyadvance-minifb/Cargo.toml +++ b/platform/rustboyadvance-minifb/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-ng = {path = "../"} +rustboyadvance-ng = {path = "../../"} minifb = "0.11.2" clap = {version = "2.33", features = ["color", "yaml"]} bit = "^0.1" diff --git a/rustboyadvance-minifb/src/cli.yml b/platform/rustboyadvance-minifb/src/cli.yml similarity index 100% rename from rustboyadvance-minifb/src/cli.yml rename to platform/rustboyadvance-minifb/src/cli.yml diff --git a/rustboyadvance-minifb/src/main.rs b/platform/rustboyadvance-minifb/src/main.rs similarity index 100% rename from rustboyadvance-minifb/src/main.rs rename to platform/rustboyadvance-minifb/src/main.rs diff --git a/rustboyadvance-sdl2/Cargo.toml b/platform/rustboyadvance-sdl2/Cargo.toml similarity index 94% rename from rustboyadvance-sdl2/Cargo.toml rename to platform/rustboyadvance-sdl2/Cargo.toml index 2619c99..0392478 100644 --- a/rustboyadvance-sdl2/Cargo.toml +++ b/platform/rustboyadvance-sdl2/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-ng = {path = "../"} +rustboyadvance-ng = {path = "../../"} sdl2 = {version = "0.33.0", features = ["image"]} ringbuf = "0.2.1" bytesize = "1.0.0" diff --git a/rustboyadvance-sdl2/build.rs b/platform/rustboyadvance-sdl2/build.rs similarity index 80% rename from rustboyadvance-sdl2/build.rs rename to platform/rustboyadvance-sdl2/build.rs index cb153e8..d450e5b 100644 --- a/rustboyadvance-sdl2/build.rs +++ b/platform/rustboyadvance-sdl2/build.rs @@ -4,7 +4,7 @@ use winres; #[cfg(windows)] fn main() { let mut res = winres::WindowsResource::new(); - res.set_icon("../assets/icon.ico"); + res.set_icon("../../assets/icon.ico"); res.compile().unwrap(); } diff --git a/rustboyadvance-sdl2/src/audio.rs b/platform/rustboyadvance-sdl2/src/audio.rs similarity index 100% rename from rustboyadvance-sdl2/src/audio.rs rename to platform/rustboyadvance-sdl2/src/audio.rs diff --git a/rustboyadvance-sdl2/src/cli.yml b/platform/rustboyadvance-sdl2/src/cli.yml similarity index 100% rename from rustboyadvance-sdl2/src/cli.yml rename to platform/rustboyadvance-sdl2/src/cli.yml diff --git a/rustboyadvance-sdl2/src/input.rs b/platform/rustboyadvance-sdl2/src/input.rs similarity index 100% rename from rustboyadvance-sdl2/src/input.rs rename to platform/rustboyadvance-sdl2/src/input.rs diff --git a/rustboyadvance-sdl2/src/main.rs b/platform/rustboyadvance-sdl2/src/main.rs similarity index 100% rename from rustboyadvance-sdl2/src/main.rs rename to platform/rustboyadvance-sdl2/src/main.rs diff --git a/rustboyadvance-sdl2/src/video.rs b/platform/rustboyadvance-sdl2/src/video.rs similarity index 100% rename from rustboyadvance-sdl2/src/video.rs rename to platform/rustboyadvance-sdl2/src/video.rs diff --git a/src/core/gba.rs b/src/core/gba.rs index a0e3f3f..dd3478b 100644 --- a/src/core/gba.rs +++ b/src/core/gba.rs @@ -85,6 +85,8 @@ impl GameBoyAdvance { input_device: input_device, cycles_to_next_event: 1, + + overshoot_cycles: 0, }) }