fix names

This commit is contained in:
Alex Janka 2023-03-03 19:33:28 +11:00
parent ad47852f47
commit f85cf81631
4 changed files with 19 additions and 19 deletions

26
Cargo.lock generated
View file

@ -423,6 +423,19 @@ dependencies = [
[[package]] [[package]]
name = "gb-emu" name = "gb-emu"
version = "0.1.0" version = "0.1.0"
dependencies = [
"clap",
"cpal",
"ctrlc",
"futures",
"gb-emu-lib",
"gilrs",
"minifb",
]
[[package]]
name = "gb-emu-lib"
version = "0.1.0"
dependencies = [ dependencies = [
"async-ringbuf", "async-ringbuf",
"futures", "futures",
@ -432,19 +445,6 @@ dependencies = [
"samplerate", "samplerate",
] ]
[[package]]
name = "gb-emu-bin"
version = "0.1.0"
dependencies = [
"clap",
"cpal",
"ctrlc",
"futures",
"gb-emu",
"gilrs",
"minifb",
]
[[package]] [[package]]
name = "getrandom" name = "getrandom"
version = "0.2.8" version = "0.2.8"

View file

@ -1,12 +1,12 @@
[package] [package]
name = "gb-emu-bin" name = "gb-emu"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
gb-emu = { path = "../gb-emu-lib" } gb-emu-lib = { path = "../gb-emu-lib" }
clap = {version = "4.1.8", features = ["derive"]} clap = {version = "4.1.8", features = ["derive"]}
minifb = "0.24" minifb = "0.24"
gilrs = "0.10.1" gilrs = "0.10.1"

View file

@ -8,7 +8,7 @@ use cpal::{
Stream, Stream,
}; };
use futures::executor; use futures::executor;
use gb_emu::{ use gb_emu_lib::{
connect::{AudioOutput, EmulatorMessage, JoypadState, Renderer}, connect::{AudioOutput, EmulatorMessage, JoypadState, Renderer},
util::scale_buffer, util::scale_buffer,
}; };
@ -74,7 +74,7 @@ fn main() {
3 3
}; };
let options = gb_emu::Options { let options = gb_emu_lib::Options {
rom_path: args.rom, rom_path: args.rom,
save_path: args.save, save_path: args.save,
no_save: args.no_save, no_save: args.no_save,
@ -97,7 +97,7 @@ fn main() {
let (output, _stream) = create_audio_output(); let (output, _stream) = create_audio_output();
gb_emu::init( gb_emu_lib::init(
receiver, receiver,
options, options,
Box::new(WindowRenderer::new(factor, Some(Gilrs::new().unwrap()))), Box::new(WindowRenderer::new(factor, Some(Gilrs::new().unwrap()))),

View file

@ -1,5 +1,5 @@
[package] [package]
name = "gb-emu" name = "gb-emu-lib"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"