diff --git a/Cargo.lock b/Cargo.lock index 7e3ba88..741351b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,6 +423,19 @@ dependencies = [ [[package]] name = "gb-emu" version = "0.1.0" +dependencies = [ + "clap", + "cpal", + "ctrlc", + "futures", + "gb-emu-lib", + "gilrs", + "minifb", +] + +[[package]] +name = "gb-emu-lib" +version = "0.1.0" dependencies = [ "async-ringbuf", "futures", @@ -432,19 +445,6 @@ dependencies = [ "samplerate", ] -[[package]] -name = "gb-emu-bin" -version = "0.1.0" -dependencies = [ - "clap", - "cpal", - "ctrlc", - "futures", - "gb-emu", - "gilrs", - "minifb", -] - [[package]] name = "getrandom" version = "0.2.8" diff --git a/gb-emu-bin/Cargo.toml b/gb-emu-bin/Cargo.toml index 12a75d5..40086b5 100644 --- a/gb-emu-bin/Cargo.toml +++ b/gb-emu-bin/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "gb-emu-bin" +name = "gb-emu" version = "0.1.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -gb-emu = { path = "../gb-emu-lib" } +gb-emu-lib = { path = "../gb-emu-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-bin/src/main.rs index 844b4fa..fc095af 100644 --- a/gb-emu-bin/src/main.rs +++ b/gb-emu-bin/src/main.rs @@ -8,7 +8,7 @@ use cpal::{ Stream, }; use futures::executor; -use gb_emu::{ +use gb_emu_lib::{ connect::{AudioOutput, EmulatorMessage, JoypadState, Renderer}, util::scale_buffer, }; @@ -74,7 +74,7 @@ fn main() { 3 }; - let options = gb_emu::Options { + let options = gb_emu_lib::Options { rom_path: args.rom, save_path: args.save, no_save: args.no_save, @@ -97,7 +97,7 @@ fn main() { let (output, _stream) = create_audio_output(); - gb_emu::init( + gb_emu_lib::init( receiver, options, Box::new(WindowRenderer::new(factor, Some(Gilrs::new().unwrap()))), diff --git a/gb-emu-lib/Cargo.toml b/gb-emu-lib/Cargo.toml index 3ebc361..8ed0a83 100644 --- a/gb-emu-lib/Cargo.toml +++ b/gb-emu-lib/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gb-emu" +name = "gb-emu-lib" version = "0.1.0" edition = "2021"