diff --git a/Cargo.toml b/Cargo.toml index 54ce792..2757cd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "core", "arm7tdmi", "utils", - "platform/rustboyadvance-sdl2", + "app", "fps_bench" ] resolver = "1" diff --git a/README.md b/README.md index f219238..1977aa5 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,7 @@ Nintendo GameBoy Advance™ emulator and debugger, written in Rust. # Project structure * `core/` - Main emulator crate that ties everything together * `arm7tdmi/` - Emulation of the Arm7tdmi processor -* `platform/` - Constains executables & application built with `rustboyadvance-core` - * `platform/rustbodyadvance-wasm` - Web emulator powered by WebAssembly - * `platform/rustbodyadvance-sdl2` - Desktop application built with sdl2 - * `platform/rustbodyadvance-minifb` - Desktop application built with minifb, *not maintained*. - * `platform/rustbodyadvance-jni` - Java JNI binidngs for the emulator. - * `platform/android` - A PoC Android application. +* `app/` - Contains the desktop application built with `sdl2` ## External content The file at [`external/gamecontrollerdb.txt`](./external/gamecontrollerdb.txt) is not my work - it is sourced from [this GitHub repository](https://github.com/mdqinc/SDL_GameControllerDB) and covered by the appropriate license present in said repository. diff --git a/platform/rustboyadvance-sdl2/Cargo.toml b/app/Cargo.toml similarity index 100% rename from platform/rustboyadvance-sdl2/Cargo.toml rename to app/Cargo.toml diff --git a/platform/rustboyadvance-sdl2/build.rs b/app/build.rs similarity index 100% rename from platform/rustboyadvance-sdl2/build.rs rename to app/build.rs diff --git a/platform/rustboyadvance-sdl2/msvc/32/LICENSE.jpeg.txt b/app/msvc/32/LICENSE.jpeg.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/LICENSE.jpeg.txt rename to app/msvc/32/LICENSE.jpeg.txt diff --git a/platform/rustboyadvance-sdl2/msvc/32/LICENSE.png.txt b/app/msvc/32/LICENSE.png.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/LICENSE.png.txt rename to app/msvc/32/LICENSE.png.txt diff --git a/platform/rustboyadvance-sdl2/msvc/32/LICENSE.tiff.txt b/app/msvc/32/LICENSE.tiff.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/LICENSE.tiff.txt rename to app/msvc/32/LICENSE.tiff.txt diff --git a/platform/rustboyadvance-sdl2/msvc/32/LICENSE.webp.txt b/app/msvc/32/LICENSE.webp.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/LICENSE.webp.txt rename to app/msvc/32/LICENSE.webp.txt diff --git a/platform/rustboyadvance-sdl2/msvc/32/LICENSE.zlib.txt b/app/msvc/32/LICENSE.zlib.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/LICENSE.zlib.txt rename to app/msvc/32/LICENSE.zlib.txt diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2.dll.REMOVED.git-id b/app/msvc/32/SDL2.dll.REMOVED.git-id similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2.dll.REMOVED.git-id rename to app/msvc/32/SDL2.dll.REMOVED.git-id diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2.lib b/app/msvc/32/SDL2.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2.lib rename to app/msvc/32/SDL2.lib diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2_image.dll b/app/msvc/32/SDL2_image.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2_image.dll rename to app/msvc/32/SDL2_image.dll diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2_image.lib b/app/msvc/32/SDL2_image.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2_image.lib rename to app/msvc/32/SDL2_image.lib diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2main.lib b/app/msvc/32/SDL2main.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2main.lib rename to app/msvc/32/SDL2main.lib diff --git a/platform/rustboyadvance-sdl2/msvc/32/SDL2test.lib b/app/msvc/32/SDL2test.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/SDL2test.lib rename to app/msvc/32/SDL2test.lib diff --git a/platform/rustboyadvance-sdl2/msvc/32/libjpeg-9.dll b/app/msvc/32/libjpeg-9.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/libjpeg-9.dll rename to app/msvc/32/libjpeg-9.dll diff --git a/platform/rustboyadvance-sdl2/msvc/32/libpng16-16.dll b/app/msvc/32/libpng16-16.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/libpng16-16.dll rename to app/msvc/32/libpng16-16.dll diff --git a/platform/rustboyadvance-sdl2/msvc/32/libtiff-5.dll b/app/msvc/32/libtiff-5.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/libtiff-5.dll rename to app/msvc/32/libtiff-5.dll diff --git a/platform/rustboyadvance-sdl2/msvc/32/libwebp-7.dll b/app/msvc/32/libwebp-7.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/libwebp-7.dll rename to app/msvc/32/libwebp-7.dll diff --git a/platform/rustboyadvance-sdl2/msvc/32/zlib1.dll b/app/msvc/32/zlib1.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/32/zlib1.dll rename to app/msvc/32/zlib1.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/LICENSE.jpeg.txt b/app/msvc/64/LICENSE.jpeg.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/LICENSE.jpeg.txt rename to app/msvc/64/LICENSE.jpeg.txt diff --git a/platform/rustboyadvance-sdl2/msvc/64/LICENSE.png.txt b/app/msvc/64/LICENSE.png.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/LICENSE.png.txt rename to app/msvc/64/LICENSE.png.txt diff --git a/platform/rustboyadvance-sdl2/msvc/64/LICENSE.tiff.txt b/app/msvc/64/LICENSE.tiff.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/LICENSE.tiff.txt rename to app/msvc/64/LICENSE.tiff.txt diff --git a/platform/rustboyadvance-sdl2/msvc/64/LICENSE.webp.txt b/app/msvc/64/LICENSE.webp.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/LICENSE.webp.txt rename to app/msvc/64/LICENSE.webp.txt diff --git a/platform/rustboyadvance-sdl2/msvc/64/LICENSE.zlib.txt b/app/msvc/64/LICENSE.zlib.txt similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/LICENSE.zlib.txt rename to app/msvc/64/LICENSE.zlib.txt diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2.dll.REMOVED.git-id b/app/msvc/64/SDL2.dll.REMOVED.git-id similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2.dll.REMOVED.git-id rename to app/msvc/64/SDL2.dll.REMOVED.git-id diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2.lib b/app/msvc/64/SDL2.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2.lib rename to app/msvc/64/SDL2.lib diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2_image.dll b/app/msvc/64/SDL2_image.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2_image.dll rename to app/msvc/64/SDL2_image.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2_image.lib b/app/msvc/64/SDL2_image.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2_image.lib rename to app/msvc/64/SDL2_image.lib diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2main.lib b/app/msvc/64/SDL2main.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2main.lib rename to app/msvc/64/SDL2main.lib diff --git a/platform/rustboyadvance-sdl2/msvc/64/SDL2test.lib b/app/msvc/64/SDL2test.lib similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/SDL2test.lib rename to app/msvc/64/SDL2test.lib diff --git a/platform/rustboyadvance-sdl2/msvc/64/libjpeg-9.dll b/app/msvc/64/libjpeg-9.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/libjpeg-9.dll rename to app/msvc/64/libjpeg-9.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/libpng16-16.dll b/app/msvc/64/libpng16-16.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/libpng16-16.dll rename to app/msvc/64/libpng16-16.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/libtiff-5.dll b/app/msvc/64/libtiff-5.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/libtiff-5.dll rename to app/msvc/64/libtiff-5.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/libwebp-7.dll b/app/msvc/64/libwebp-7.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/libwebp-7.dll rename to app/msvc/64/libwebp-7.dll diff --git a/platform/rustboyadvance-sdl2/msvc/64/zlib1.dll b/app/msvc/64/zlib1.dll similarity index 100% rename from platform/rustboyadvance-sdl2/msvc/64/zlib1.dll rename to app/msvc/64/zlib1.dll diff --git a/platform/rustboyadvance-sdl2/src/audio.rs b/app/src/audio.rs similarity index 100% rename from platform/rustboyadvance-sdl2/src/audio.rs rename to app/src/audio.rs diff --git a/platform/rustboyadvance-sdl2/src/cli.yml b/app/src/cli.yml similarity index 100% rename from platform/rustboyadvance-sdl2/src/cli.yml rename to app/src/cli.yml diff --git a/platform/rustboyadvance-sdl2/src/input.rs b/app/src/input.rs similarity index 100% rename from platform/rustboyadvance-sdl2/src/input.rs rename to app/src/input.rs diff --git a/platform/rustboyadvance-sdl2/src/main.rs b/app/src/main.rs similarity index 100% rename from platform/rustboyadvance-sdl2/src/main.rs rename to app/src/main.rs diff --git a/platform/rustboyadvance-sdl2/src/options.rs b/app/src/options.rs similarity index 100% rename from platform/rustboyadvance-sdl2/src/options.rs rename to app/src/options.rs diff --git a/platform/rustboyadvance-sdl2/src/video.rs b/app/src/video.rs similarity index 100% rename from platform/rustboyadvance-sdl2/src/video.rs rename to app/src/video.rs