From 879374a9b0d0be6da88fe28c361adfe9a9a1324a Mon Sep 17 00:00:00 2001 From: Michel Heily Date: Fri, 29 May 2020 17:32:50 +0300 Subject: [PATCH] Refactor dir rustboyadvance-core -> core Former-commit-id: 5af970f6d56d321472f2b91885e41ca113390986 Former-commit-id: 748e222a36362eb5ac8909068c32f2d3f98ca536 --- Cargo.toml | 2 +- README.md | 2 +- bindings/rustboyadvance-jni/Cargo.toml | 2 +- {rustboyadvance-core => core}/Cargo.toml | 0 {rustboyadvance-core => core}/build.rs | 0 {rustboyadvance-core => core}/overrides.yaml | 0 {rustboyadvance-core => core}/src/arm7tdmi/alu.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/arm/display.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/arm/exec.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/arm/mod.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/cpu.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/exception.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/mod.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/psr.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/thumb/display.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/thumb/exec.rs | 0 {rustboyadvance-core => core}/src/arm7tdmi/thumb/mod.rs | 0 {rustboyadvance-core => core}/src/bus.rs | 0 .../src/cartridge/backup/backup_file.rs | 0 {rustboyadvance-core => core}/src/cartridge/backup/eeprom.rs | 0 {rustboyadvance-core => core}/src/cartridge/backup/flash.rs | 0 {rustboyadvance-core => core}/src/cartridge/backup/mod.rs | 0 {rustboyadvance-core => core}/src/cartridge/builder.rs | 0 {rustboyadvance-core => core}/src/cartridge/gpio.rs | 0 {rustboyadvance-core => core}/src/cartridge/header.rs | 0 {rustboyadvance-core => core}/src/cartridge/loader.rs | 0 {rustboyadvance-core => core}/src/cartridge/mod.rs | 0 {rustboyadvance-core => core}/src/cartridge/rtc.rs | 0 {rustboyadvance-core => core}/src/debugger/command.rs | 0 {rustboyadvance-core => core}/src/debugger/mod.rs | 0 {rustboyadvance-core => core}/src/debugger/palette_view.rs | 0 {rustboyadvance-core => core}/src/debugger/parser.rs | 0 {rustboyadvance-core => core}/src/debugger/tile_view.rs | 0 {rustboyadvance-core => core}/src/disass.rs | 0 {rustboyadvance-core => core}/src/dma.rs | 0 {rustboyadvance-core => core}/src/gba.rs | 0 {rustboyadvance-core => core}/src/gdb.rs | 0 {rustboyadvance-core => core}/src/gpu/layer.rs | 0 {rustboyadvance-core => core}/src/gpu/mod.rs | 0 {rustboyadvance-core => core}/src/gpu/mosaic.rs | 0 {rustboyadvance-core => core}/src/gpu/regs.rs | 0 {rustboyadvance-core => core}/src/gpu/render.rs | 0 {rustboyadvance-core => core}/src/gpu/render/bitmap.rs | 0 {rustboyadvance-core => core}/src/gpu/render/obj.rs | 0 {rustboyadvance-core => core}/src/gpu/render/text.rs | 0 {rustboyadvance-core => core}/src/gpu/rgb15.rs | 0 {rustboyadvance-core => core}/src/gpu/sfx.rs | 0 {rustboyadvance-core => core}/src/gpu/window.rs | 0 {rustboyadvance-core => core}/src/interrupt.rs | 0 {rustboyadvance-core => core}/src/iodev.rs | 0 {rustboyadvance-core => core}/src/keypad.rs | 0 {rustboyadvance-core => core}/src/lib.rs | 0 {rustboyadvance-core => core}/src/overrides.rs | 0 {rustboyadvance-core => core}/src/sound/dsp.rs | 0 {rustboyadvance-core => core}/src/sound/fifo.rs | 0 {rustboyadvance-core => core}/src/sound/mod.rs | 0 {rustboyadvance-core => core}/src/sysbus.rs | 0 {rustboyadvance-core => core}/src/timer.rs | 0 {rustboyadvance-core => core}/src/util.rs | 0 fps_bench/Cargo.toml | 2 +- platform/rustboyadvance-libretro/Cargo.toml | 2 +- platform/rustboyadvance-minifb/Cargo.toml | 2 +- platform/rustboyadvance-sdl2/Cargo.toml | 2 +- platform/rustboyadvance-wasm/Cargo.toml | 2 +- 64 files changed, 8 insertions(+), 8 deletions(-) rename {rustboyadvance-core => core}/Cargo.toml (100%) rename {rustboyadvance-core => core}/build.rs (100%) rename {rustboyadvance-core => core}/overrides.yaml (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/alu.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/arm/display.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/arm/exec.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/arm/mod.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/cpu.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/exception.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/mod.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/psr.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/thumb/display.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/thumb/exec.rs (100%) rename {rustboyadvance-core => core}/src/arm7tdmi/thumb/mod.rs (100%) rename {rustboyadvance-core => core}/src/bus.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/backup/backup_file.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/backup/eeprom.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/backup/flash.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/backup/mod.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/builder.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/gpio.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/header.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/loader.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/mod.rs (100%) rename {rustboyadvance-core => core}/src/cartridge/rtc.rs (100%) rename {rustboyadvance-core => core}/src/debugger/command.rs (100%) rename {rustboyadvance-core => core}/src/debugger/mod.rs (100%) rename {rustboyadvance-core => core}/src/debugger/palette_view.rs (100%) rename {rustboyadvance-core => core}/src/debugger/parser.rs (100%) rename {rustboyadvance-core => core}/src/debugger/tile_view.rs (100%) rename {rustboyadvance-core => core}/src/disass.rs (100%) rename {rustboyadvance-core => core}/src/dma.rs (100%) rename {rustboyadvance-core => core}/src/gba.rs (100%) rename {rustboyadvance-core => core}/src/gdb.rs (100%) rename {rustboyadvance-core => core}/src/gpu/layer.rs (100%) rename {rustboyadvance-core => core}/src/gpu/mod.rs (100%) rename {rustboyadvance-core => core}/src/gpu/mosaic.rs (100%) rename {rustboyadvance-core => core}/src/gpu/regs.rs (100%) rename {rustboyadvance-core => core}/src/gpu/render.rs (100%) rename {rustboyadvance-core => core}/src/gpu/render/bitmap.rs (100%) rename {rustboyadvance-core => core}/src/gpu/render/obj.rs (100%) rename {rustboyadvance-core => core}/src/gpu/render/text.rs (100%) rename {rustboyadvance-core => core}/src/gpu/rgb15.rs (100%) rename {rustboyadvance-core => core}/src/gpu/sfx.rs (100%) rename {rustboyadvance-core => core}/src/gpu/window.rs (100%) rename {rustboyadvance-core => core}/src/interrupt.rs (100%) rename {rustboyadvance-core => core}/src/iodev.rs (100%) rename {rustboyadvance-core => core}/src/keypad.rs (100%) rename {rustboyadvance-core => core}/src/lib.rs (100%) rename {rustboyadvance-core => core}/src/overrides.rs (100%) rename {rustboyadvance-core => core}/src/sound/dsp.rs (100%) rename {rustboyadvance-core => core}/src/sound/fifo.rs (100%) rename {rustboyadvance-core => core}/src/sound/mod.rs (100%) rename {rustboyadvance-core => core}/src/sysbus.rs (100%) rename {rustboyadvance-core => core}/src/timer.rs (100%) rename {rustboyadvance-core => core}/src/util.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index cb60160..516a8dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "rustboyadvance-core/", + "core", "platform/rustboyadvance-sdl2", "platform/rustboyadvance-libretro", "platform/rustboyadvance-minifb", diff --git a/README.md b/README.md index 29baa61..3c45b0c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Nintendo GameBoy Advance ™ emulator and debugger, written in rust. WebAssembly Demo: https://michelhe.github.io/rustboyadvance-ng/ ![Deploy](https://github.com/michelhe/rustboyadvance-ng/workflows/Deploy/badge.svg?branch=master) # Project Structure -* `rustboyadvance-core/src` - Main library crate +* `core/` - Main emulator crate * `bindings/` - Bindings to other languages. Currently only java binidings through JNI. * `platform/` - Constains executables & application built with `rustboyadvance-core` * `platform/rustbodyadvance-wasm` - Web emulator powered by WebAssembly diff --git a/bindings/rustboyadvance-jni/Cargo.toml b/bindings/rustboyadvance-jni/Cargo.toml index 81d5ea4..a6848a4 100644 --- a/bindings/rustboyadvance-jni/Cargo.toml +++ b/bindings/rustboyadvance-jni/Cargo.toml @@ -10,7 +10,7 @@ publish = false crate-type = ["staticlib", "cdylib"] [dependencies] -rustboyadvance-core = {path = "../../rustboyadvance-core/"} +rustboyadvance-core = {path = "../../core/"} jni = { version = "0.16", default-features = false } log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]} diff --git a/rustboyadvance-core/Cargo.toml b/core/Cargo.toml similarity index 100% rename from rustboyadvance-core/Cargo.toml rename to core/Cargo.toml diff --git a/rustboyadvance-core/build.rs b/core/build.rs similarity index 100% rename from rustboyadvance-core/build.rs rename to core/build.rs diff --git a/rustboyadvance-core/overrides.yaml b/core/overrides.yaml similarity index 100% rename from rustboyadvance-core/overrides.yaml rename to core/overrides.yaml diff --git a/rustboyadvance-core/src/arm7tdmi/alu.rs b/core/src/arm7tdmi/alu.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/alu.rs rename to core/src/arm7tdmi/alu.rs diff --git a/rustboyadvance-core/src/arm7tdmi/arm/display.rs b/core/src/arm7tdmi/arm/display.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/arm/display.rs rename to core/src/arm7tdmi/arm/display.rs diff --git a/rustboyadvance-core/src/arm7tdmi/arm/exec.rs b/core/src/arm7tdmi/arm/exec.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/arm/exec.rs rename to core/src/arm7tdmi/arm/exec.rs diff --git a/rustboyadvance-core/src/arm7tdmi/arm/mod.rs b/core/src/arm7tdmi/arm/mod.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/arm/mod.rs rename to core/src/arm7tdmi/arm/mod.rs diff --git a/rustboyadvance-core/src/arm7tdmi/cpu.rs b/core/src/arm7tdmi/cpu.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/cpu.rs rename to core/src/arm7tdmi/cpu.rs diff --git a/rustboyadvance-core/src/arm7tdmi/exception.rs b/core/src/arm7tdmi/exception.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/exception.rs rename to core/src/arm7tdmi/exception.rs diff --git a/rustboyadvance-core/src/arm7tdmi/mod.rs b/core/src/arm7tdmi/mod.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/mod.rs rename to core/src/arm7tdmi/mod.rs diff --git a/rustboyadvance-core/src/arm7tdmi/psr.rs b/core/src/arm7tdmi/psr.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/psr.rs rename to core/src/arm7tdmi/psr.rs diff --git a/rustboyadvance-core/src/arm7tdmi/thumb/display.rs b/core/src/arm7tdmi/thumb/display.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/thumb/display.rs rename to core/src/arm7tdmi/thumb/display.rs diff --git a/rustboyadvance-core/src/arm7tdmi/thumb/exec.rs b/core/src/arm7tdmi/thumb/exec.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/thumb/exec.rs rename to core/src/arm7tdmi/thumb/exec.rs diff --git a/rustboyadvance-core/src/arm7tdmi/thumb/mod.rs b/core/src/arm7tdmi/thumb/mod.rs similarity index 100% rename from rustboyadvance-core/src/arm7tdmi/thumb/mod.rs rename to core/src/arm7tdmi/thumb/mod.rs diff --git a/rustboyadvance-core/src/bus.rs b/core/src/bus.rs similarity index 100% rename from rustboyadvance-core/src/bus.rs rename to core/src/bus.rs diff --git a/rustboyadvance-core/src/cartridge/backup/backup_file.rs b/core/src/cartridge/backup/backup_file.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/backup/backup_file.rs rename to core/src/cartridge/backup/backup_file.rs diff --git a/rustboyadvance-core/src/cartridge/backup/eeprom.rs b/core/src/cartridge/backup/eeprom.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/backup/eeprom.rs rename to core/src/cartridge/backup/eeprom.rs diff --git a/rustboyadvance-core/src/cartridge/backup/flash.rs b/core/src/cartridge/backup/flash.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/backup/flash.rs rename to core/src/cartridge/backup/flash.rs diff --git a/rustboyadvance-core/src/cartridge/backup/mod.rs b/core/src/cartridge/backup/mod.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/backup/mod.rs rename to core/src/cartridge/backup/mod.rs diff --git a/rustboyadvance-core/src/cartridge/builder.rs b/core/src/cartridge/builder.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/builder.rs rename to core/src/cartridge/builder.rs diff --git a/rustboyadvance-core/src/cartridge/gpio.rs b/core/src/cartridge/gpio.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/gpio.rs rename to core/src/cartridge/gpio.rs diff --git a/rustboyadvance-core/src/cartridge/header.rs b/core/src/cartridge/header.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/header.rs rename to core/src/cartridge/header.rs diff --git a/rustboyadvance-core/src/cartridge/loader.rs b/core/src/cartridge/loader.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/loader.rs rename to core/src/cartridge/loader.rs diff --git a/rustboyadvance-core/src/cartridge/mod.rs b/core/src/cartridge/mod.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/mod.rs rename to core/src/cartridge/mod.rs diff --git a/rustboyadvance-core/src/cartridge/rtc.rs b/core/src/cartridge/rtc.rs similarity index 100% rename from rustboyadvance-core/src/cartridge/rtc.rs rename to core/src/cartridge/rtc.rs diff --git a/rustboyadvance-core/src/debugger/command.rs b/core/src/debugger/command.rs similarity index 100% rename from rustboyadvance-core/src/debugger/command.rs rename to core/src/debugger/command.rs diff --git a/rustboyadvance-core/src/debugger/mod.rs b/core/src/debugger/mod.rs similarity index 100% rename from rustboyadvance-core/src/debugger/mod.rs rename to core/src/debugger/mod.rs diff --git a/rustboyadvance-core/src/debugger/palette_view.rs b/core/src/debugger/palette_view.rs similarity index 100% rename from rustboyadvance-core/src/debugger/palette_view.rs rename to core/src/debugger/palette_view.rs diff --git a/rustboyadvance-core/src/debugger/parser.rs b/core/src/debugger/parser.rs similarity index 100% rename from rustboyadvance-core/src/debugger/parser.rs rename to core/src/debugger/parser.rs diff --git a/rustboyadvance-core/src/debugger/tile_view.rs b/core/src/debugger/tile_view.rs similarity index 100% rename from rustboyadvance-core/src/debugger/tile_view.rs rename to core/src/debugger/tile_view.rs diff --git a/rustboyadvance-core/src/disass.rs b/core/src/disass.rs similarity index 100% rename from rustboyadvance-core/src/disass.rs rename to core/src/disass.rs diff --git a/rustboyadvance-core/src/dma.rs b/core/src/dma.rs similarity index 100% rename from rustboyadvance-core/src/dma.rs rename to core/src/dma.rs diff --git a/rustboyadvance-core/src/gba.rs b/core/src/gba.rs similarity index 100% rename from rustboyadvance-core/src/gba.rs rename to core/src/gba.rs diff --git a/rustboyadvance-core/src/gdb.rs b/core/src/gdb.rs similarity index 100% rename from rustboyadvance-core/src/gdb.rs rename to core/src/gdb.rs diff --git a/rustboyadvance-core/src/gpu/layer.rs b/core/src/gpu/layer.rs similarity index 100% rename from rustboyadvance-core/src/gpu/layer.rs rename to core/src/gpu/layer.rs diff --git a/rustboyadvance-core/src/gpu/mod.rs b/core/src/gpu/mod.rs similarity index 100% rename from rustboyadvance-core/src/gpu/mod.rs rename to core/src/gpu/mod.rs diff --git a/rustboyadvance-core/src/gpu/mosaic.rs b/core/src/gpu/mosaic.rs similarity index 100% rename from rustboyadvance-core/src/gpu/mosaic.rs rename to core/src/gpu/mosaic.rs diff --git a/rustboyadvance-core/src/gpu/regs.rs b/core/src/gpu/regs.rs similarity index 100% rename from rustboyadvance-core/src/gpu/regs.rs rename to core/src/gpu/regs.rs diff --git a/rustboyadvance-core/src/gpu/render.rs b/core/src/gpu/render.rs similarity index 100% rename from rustboyadvance-core/src/gpu/render.rs rename to core/src/gpu/render.rs diff --git a/rustboyadvance-core/src/gpu/render/bitmap.rs b/core/src/gpu/render/bitmap.rs similarity index 100% rename from rustboyadvance-core/src/gpu/render/bitmap.rs rename to core/src/gpu/render/bitmap.rs diff --git a/rustboyadvance-core/src/gpu/render/obj.rs b/core/src/gpu/render/obj.rs similarity index 100% rename from rustboyadvance-core/src/gpu/render/obj.rs rename to core/src/gpu/render/obj.rs diff --git a/rustboyadvance-core/src/gpu/render/text.rs b/core/src/gpu/render/text.rs similarity index 100% rename from rustboyadvance-core/src/gpu/render/text.rs rename to core/src/gpu/render/text.rs diff --git a/rustboyadvance-core/src/gpu/rgb15.rs b/core/src/gpu/rgb15.rs similarity index 100% rename from rustboyadvance-core/src/gpu/rgb15.rs rename to core/src/gpu/rgb15.rs diff --git a/rustboyadvance-core/src/gpu/sfx.rs b/core/src/gpu/sfx.rs similarity index 100% rename from rustboyadvance-core/src/gpu/sfx.rs rename to core/src/gpu/sfx.rs diff --git a/rustboyadvance-core/src/gpu/window.rs b/core/src/gpu/window.rs similarity index 100% rename from rustboyadvance-core/src/gpu/window.rs rename to core/src/gpu/window.rs diff --git a/rustboyadvance-core/src/interrupt.rs b/core/src/interrupt.rs similarity index 100% rename from rustboyadvance-core/src/interrupt.rs rename to core/src/interrupt.rs diff --git a/rustboyadvance-core/src/iodev.rs b/core/src/iodev.rs similarity index 100% rename from rustboyadvance-core/src/iodev.rs rename to core/src/iodev.rs diff --git a/rustboyadvance-core/src/keypad.rs b/core/src/keypad.rs similarity index 100% rename from rustboyadvance-core/src/keypad.rs rename to core/src/keypad.rs diff --git a/rustboyadvance-core/src/lib.rs b/core/src/lib.rs similarity index 100% rename from rustboyadvance-core/src/lib.rs rename to core/src/lib.rs diff --git a/rustboyadvance-core/src/overrides.rs b/core/src/overrides.rs similarity index 100% rename from rustboyadvance-core/src/overrides.rs rename to core/src/overrides.rs diff --git a/rustboyadvance-core/src/sound/dsp.rs b/core/src/sound/dsp.rs similarity index 100% rename from rustboyadvance-core/src/sound/dsp.rs rename to core/src/sound/dsp.rs diff --git a/rustboyadvance-core/src/sound/fifo.rs b/core/src/sound/fifo.rs similarity index 100% rename from rustboyadvance-core/src/sound/fifo.rs rename to core/src/sound/fifo.rs diff --git a/rustboyadvance-core/src/sound/mod.rs b/core/src/sound/mod.rs similarity index 100% rename from rustboyadvance-core/src/sound/mod.rs rename to core/src/sound/mod.rs diff --git a/rustboyadvance-core/src/sysbus.rs b/core/src/sysbus.rs similarity index 100% rename from rustboyadvance-core/src/sysbus.rs rename to core/src/sysbus.rs diff --git a/rustboyadvance-core/src/timer.rs b/core/src/timer.rs similarity index 100% rename from rustboyadvance-core/src/timer.rs rename to core/src/timer.rs diff --git a/rustboyadvance-core/src/util.rs b/core/src/util.rs similarity index 100% rename from rustboyadvance-core/src/util.rs rename to core/src/util.rs diff --git a/fps_bench/Cargo.toml b/fps_bench/Cargo.toml index a0e932c..6b4b557 100644 --- a/fps_bench/Cargo.toml +++ b/fps_bench/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-core = {path = "../rustboyadvance-core/"} +rustboyadvance-core = {path = "../core/"} diff --git a/platform/rustboyadvance-libretro/Cargo.toml b/platform/rustboyadvance-libretro/Cargo.toml index b12100b..17c2f6a 100644 --- a/platform/rustboyadvance-libretro/Cargo.toml +++ b/platform/rustboyadvance-libretro/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] [dependencies] -rustboyadvance-core = { path = "../../rustboyadvance-core/" } +rustboyadvance-core = { path = "../../core/" } log = "0.4.8" libc = "0.2" libretro-sys = "0.1.1" diff --git a/platform/rustboyadvance-minifb/Cargo.toml b/platform/rustboyadvance-minifb/Cargo.toml index acfc204..387138a 100644 --- a/platform/rustboyadvance-minifb/Cargo.toml +++ b/platform/rustboyadvance-minifb/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-core = {path = "../../rustboyadvance-core/"} +rustboyadvance-core = {path = "../../core/"} minifb = "0.11.2" clap = {version = "2.33", features = ["color", "yaml"]} bit = "^0.1" diff --git a/platform/rustboyadvance-sdl2/Cargo.toml b/platform/rustboyadvance-sdl2/Cargo.toml index 32f92de..7606733 100644 --- a/platform/rustboyadvance-sdl2/Cargo.toml +++ b/platform/rustboyadvance-sdl2/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Michel Heily "] edition = "2018" [dependencies] -rustboyadvance-core = { path = "../../rustboyadvance-core/", features = ["elf_support"] } +rustboyadvance-core = { path = "../../core/", features = ["elf_support"] } sdl2 = { version = "0.33.0", features = ["image"] } ringbuf = "0.2.1" bytesize = "1.0.0" diff --git a/platform/rustboyadvance-wasm/Cargo.toml b/platform/rustboyadvance-wasm/Cargo.toml index f8b6e89..72473b8 100644 --- a/platform/rustboyadvance-wasm/Cargo.toml +++ b/platform/rustboyadvance-wasm/Cargo.toml @@ -13,7 +13,7 @@ default = ["console_error_panic_hook"] [dependencies] js-sys = "0.3.37" wasm-bindgen = "0.2" -rustboyadvance-core = { path = "../../rustboyadvance-core" } +rustboyadvance-core = { path = "../../core" } # The `console_error_panic_hook` crate provides better debugging of panics by # logging them with `console.error`. This is great for development, but requires