From f2e777e516368edda02b2d6913f53de0b3d1b8c4 Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Sat, 4 Mar 2023 08:46:00 +1100 Subject: [PATCH] last move i promise --- Cargo.toml | 2 +- {gb-emu-bin => gb-emu}/Cargo.toml | 2 +- {gb-emu-bin => gb-emu}/src/main.rs | 0 {gb-emu-lib => lib}/Cargo.toml | 0 {gb-emu-lib => lib}/src/connect/mod.rs | 0 {gb-emu-lib => lib}/src/constants.rs | 0 {gb-emu-lib => lib}/src/lib.rs | 0 {gb-emu-lib => lib}/src/processor/instructions/instructions.rs | 0 {gb-emu-lib => lib}/src/processor/instructions/mod.rs | 0 {gb-emu-lib => lib}/src/processor/instructions/primitives.rs | 0 {gb-emu-lib => lib}/src/processor/memory.rs | 0 {gb-emu-lib => lib}/src/processor/memory/interrupts.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/apu.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/apu/channels.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/apu/types.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/gpu.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/gpu/addresses.rs | 0 .../src/processor/memory/mmio/gpu/tile_window.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/gpu/types.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/joypad.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/mod.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/serial.rs | 0 {gb-emu-lib => lib}/src/processor/memory/mmio/timer.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc1.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc2.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc3.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc5.rs | 0 {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/none.rs | 0 {gb-emu-lib => lib}/src/processor/mod.rs | 0 {gb-emu-lib => lib}/src/processor/opcodes.rs | 0 {gb-emu-lib => lib}/src/util.rs | 0 33 files changed, 2 insertions(+), 2 deletions(-) rename {gb-emu-bin => gb-emu}/Cargo.toml (88%) rename {gb-emu-bin => gb-emu}/src/main.rs (100%) rename {gb-emu-lib => lib}/Cargo.toml (100%) rename {gb-emu-lib => lib}/src/connect/mod.rs (100%) rename {gb-emu-lib => lib}/src/constants.rs (100%) rename {gb-emu-lib => lib}/src/lib.rs (100%) rename {gb-emu-lib => lib}/src/processor/instructions/instructions.rs (100%) rename {gb-emu-lib => lib}/src/processor/instructions/mod.rs (100%) rename {gb-emu-lib => lib}/src/processor/instructions/primitives.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/interrupts.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/apu.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/apu/channels.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/apu/types.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/gpu.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/gpu/addresses.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/gpu/tile_window.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/gpu/types.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/joypad.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/mod.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/serial.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/mmio/timer.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc1.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc2.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc3.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/mbc5.rs (100%) rename {gb-emu-lib => lib}/src/processor/memory/rom/mbcs/none.rs (100%) rename {gb-emu-lib => lib}/src/processor/mod.rs (100%) rename {gb-emu-lib => lib}/src/processor/opcodes.rs (100%) rename {gb-emu-lib => lib}/src/util.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 5a2850b..6d3da61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["gb-emu-lib", "gb-emu-bin"] \ No newline at end of file +members = ["lib", "gb-emu"] \ No newline at end of file diff --git a/gb-emu-bin/Cargo.toml b/gb-emu/Cargo.toml similarity index 88% rename from gb-emu-bin/Cargo.toml rename to gb-emu/Cargo.toml index 40086b5..6fe1624 100644 --- a/gb-emu-bin/Cargo.toml +++ b/gb-emu/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gb-emu-lib = { path = "../gb-emu-lib" } +gb-emu-lib = { path = "../lib" } clap = {version = "4.1.8", features = ["derive"]} minifb = "0.24" gilrs = "0.10.1" diff --git a/gb-emu-bin/src/main.rs b/gb-emu/src/main.rs similarity index 100% rename from gb-emu-bin/src/main.rs rename to gb-emu/src/main.rs diff --git a/gb-emu-lib/Cargo.toml b/lib/Cargo.toml similarity index 100% rename from gb-emu-lib/Cargo.toml rename to lib/Cargo.toml diff --git a/gb-emu-lib/src/connect/mod.rs b/lib/src/connect/mod.rs similarity index 100% rename from gb-emu-lib/src/connect/mod.rs rename to lib/src/connect/mod.rs diff --git a/gb-emu-lib/src/constants.rs b/lib/src/constants.rs similarity index 100% rename from gb-emu-lib/src/constants.rs rename to lib/src/constants.rs diff --git a/gb-emu-lib/src/lib.rs b/lib/src/lib.rs similarity index 100% rename from gb-emu-lib/src/lib.rs rename to lib/src/lib.rs diff --git a/gb-emu-lib/src/processor/instructions/instructions.rs b/lib/src/processor/instructions/instructions.rs similarity index 100% rename from gb-emu-lib/src/processor/instructions/instructions.rs rename to lib/src/processor/instructions/instructions.rs diff --git a/gb-emu-lib/src/processor/instructions/mod.rs b/lib/src/processor/instructions/mod.rs similarity index 100% rename from gb-emu-lib/src/processor/instructions/mod.rs rename to lib/src/processor/instructions/mod.rs diff --git a/gb-emu-lib/src/processor/instructions/primitives.rs b/lib/src/processor/instructions/primitives.rs similarity index 100% rename from gb-emu-lib/src/processor/instructions/primitives.rs rename to lib/src/processor/instructions/primitives.rs diff --git a/gb-emu-lib/src/processor/memory.rs b/lib/src/processor/memory.rs similarity index 100% rename from gb-emu-lib/src/processor/memory.rs rename to lib/src/processor/memory.rs diff --git a/gb-emu-lib/src/processor/memory/interrupts.rs b/lib/src/processor/memory/interrupts.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/interrupts.rs rename to lib/src/processor/memory/interrupts.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/apu.rs b/lib/src/processor/memory/mmio/apu.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/apu.rs rename to lib/src/processor/memory/mmio/apu.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/apu/channels.rs b/lib/src/processor/memory/mmio/apu/channels.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/apu/channels.rs rename to lib/src/processor/memory/mmio/apu/channels.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/apu/types.rs b/lib/src/processor/memory/mmio/apu/types.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/apu/types.rs rename to lib/src/processor/memory/mmio/apu/types.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/gpu.rs b/lib/src/processor/memory/mmio/gpu.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/gpu.rs rename to lib/src/processor/memory/mmio/gpu.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/gpu/addresses.rs b/lib/src/processor/memory/mmio/gpu/addresses.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/gpu/addresses.rs rename to lib/src/processor/memory/mmio/gpu/addresses.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/gpu/tile_window.rs b/lib/src/processor/memory/mmio/gpu/tile_window.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/gpu/tile_window.rs rename to lib/src/processor/memory/mmio/gpu/tile_window.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/gpu/types.rs b/lib/src/processor/memory/mmio/gpu/types.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/gpu/types.rs rename to lib/src/processor/memory/mmio/gpu/types.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/joypad.rs b/lib/src/processor/memory/mmio/joypad.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/joypad.rs rename to lib/src/processor/memory/mmio/joypad.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/mod.rs b/lib/src/processor/memory/mmio/mod.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/mod.rs rename to lib/src/processor/memory/mmio/mod.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/serial.rs b/lib/src/processor/memory/mmio/serial.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/serial.rs rename to lib/src/processor/memory/mmio/serial.rs diff --git a/gb-emu-lib/src/processor/memory/mmio/timer.rs b/lib/src/processor/memory/mmio/timer.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/mmio/timer.rs rename to lib/src/processor/memory/mmio/timer.rs diff --git a/gb-emu-lib/src/processor/memory/rom.rs b/lib/src/processor/memory/rom.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom.rs rename to lib/src/processor/memory/rom.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs.rs b/lib/src/processor/memory/rom/mbcs.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs.rs rename to lib/src/processor/memory/rom/mbcs.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs/mbc1.rs b/lib/src/processor/memory/rom/mbcs/mbc1.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs/mbc1.rs rename to lib/src/processor/memory/rom/mbcs/mbc1.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs/mbc2.rs b/lib/src/processor/memory/rom/mbcs/mbc2.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs/mbc2.rs rename to lib/src/processor/memory/rom/mbcs/mbc2.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs/mbc3.rs b/lib/src/processor/memory/rom/mbcs/mbc3.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs/mbc3.rs rename to lib/src/processor/memory/rom/mbcs/mbc3.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs/mbc5.rs b/lib/src/processor/memory/rom/mbcs/mbc5.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs/mbc5.rs rename to lib/src/processor/memory/rom/mbcs/mbc5.rs diff --git a/gb-emu-lib/src/processor/memory/rom/mbcs/none.rs b/lib/src/processor/memory/rom/mbcs/none.rs similarity index 100% rename from gb-emu-lib/src/processor/memory/rom/mbcs/none.rs rename to lib/src/processor/memory/rom/mbcs/none.rs diff --git a/gb-emu-lib/src/processor/mod.rs b/lib/src/processor/mod.rs similarity index 100% rename from gb-emu-lib/src/processor/mod.rs rename to lib/src/processor/mod.rs diff --git a/gb-emu-lib/src/processor/opcodes.rs b/lib/src/processor/opcodes.rs similarity index 100% rename from gb-emu-lib/src/processor/opcodes.rs rename to lib/src/processor/opcodes.rs diff --git a/gb-emu-lib/src/util.rs b/lib/src/util.rs similarity index 100% rename from gb-emu-lib/src/util.rs rename to lib/src/util.rs