Macintosh-Tools
/
moa
mirror of https://github.com/transistorfet/moa.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed package names to not conflict with binary names

This commit is contained in:
transistor 2023-04-30 21:32:33 -07:00
parent 074d29c023
commit 8b30750924
15 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Cargo.lock generated
View File

@ -590,16 +590,6 @@ dependencies = [
"nix 0.25.0",
]
[[package]]
name = "moa_computie"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_generic",
"moa_peripherals_motorola",
]
[[package]]
name = "moa_console"
version = "0.1.0"
@ -607,12 +597,12 @@ dependencies = [
"clap 3.2.22",
"log",
"moa_common",
"moa_computie",
"moa_core",
"moa_genesis",
"moa_m68k",
"moa_peripherals_generic",
"moa_peripherals_motorola",
"moa_systems_computie",
"moa_systems_genesis",
"simple_logger",
]
@ -623,16 +613,6 @@ dependencies = [
"log",
]
[[package]]
name = "moa_genesis"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_yamaha",
"moa_z80",
]
[[package]]
name = "moa_m68k"
version = "0.1.0"
@ -641,16 +621,6 @@ dependencies = [
"moa_parsing",
]
[[package]]
name = "moa_macintosh"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_mos",
"moa_peripherals_zilog",
]
[[package]]
name = "moa_minifb"
version = "0.1.0"
@ -659,12 +629,12 @@ dependencies = [
"log",
"minifb",
"moa_common",
"moa_computie",
"moa_core",
"moa_genesis",
"moa_macintosh",
"moa_peripherals_yamaha",
"moa_trs80",
"moa_systems_computie",
"moa_systems_genesis",
"moa_systems_macintosh",
"moa_systems_trs80",
"simple_logger",
]
@ -713,7 +683,37 @@ dependencies = [
]
[[package]]
name = "moa_trs80"
name = "moa_systems_computie"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_generic",
"moa_peripherals_motorola",
]
[[package]]
name = "moa_systems_genesis"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_yamaha",
"moa_z80",
]
[[package]]
name = "moa_systems_macintosh"
version = "0.1.0"
dependencies = [
"moa_core",
"moa_m68k",
"moa_peripherals_mos",
"moa_peripherals_zilog",
]
[[package]]
name = "moa_systems_trs80"
version = "0.1.0"
dependencies = [
"moa_core",

4
emulator/frontends/console/Cargo.toml
View File

@ -12,8 +12,8 @@ simple_logger = "2.3.0"
moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["tty"] }
moa_genesis = { path = "../../systems/genesis" }
moa_computie = { path = "../../systems/computie" }
moa_systems_genesis = { path = "../../systems/genesis" }
moa_systems_computie = { path = "../../systems/computie" }
moa_m68k = { path = "../../cpus/m68k" }
moa_peripherals_generic = { path = "../../peripherals/generic" }
moa_peripherals_motorola = { path = "../../peripherals/motorola" }

2
emulator/frontends/console/src/bin/moa-bench.rs
View File

@ -8,7 +8,7 @@ use moa_m68k::{M68k, M68kType};
use moa_peripherals_generic::AtaDevice;
use moa_peripherals_motorola::MC68681;
use moa_computie::build_computie;
use moa_systems_computie::build_computie;
fn main() {
thread::spawn(|| {

2
emulator/frontends/console/src/bin/moa-computie.rs
View File

@ -1,6 +1,6 @@
use moa_console::ConsoleFrontend;
use moa_computie::build_computie;
use moa_systems_computie::build_computie;
fn main() {
simple_logger::SimpleLogger::new()

2
emulator/frontends/console/src/bin/moa-console-genesis.rs
View File

@ -2,7 +2,7 @@
use clap::{App, Arg};
use moa_console::ConsoleFrontend;
use moa_genesis::{build_genesis, SegaGenesisOptions};
use moa_systems_genesis::{build_genesis, SegaGenesisOptions};
fn main() {
let matches = App::new("Sega Genesis/Mega Drive Emulator")

8
emulator/frontends/minifb/Cargo.toml
View File

@ -13,9 +13,9 @@ simple_logger = "2.3.0"
moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["audio"] }
moa_genesis = { path = "../../systems/genesis" }
moa_computie = { path = "../../systems/computie" }
moa_trs80 = { path = "../../systems/trs80" }
moa_macintosh = { path = "../../systems/macintosh" }
moa_systems_genesis = { path = "../../systems/genesis" }
moa_systems_computie = { path = "../../systems/computie" }
moa_systems_trs80 = { path = "../../systems/trs80" }
moa_systems_macintosh = { path = "../../systems/macintosh" }
moa_peripherals_yamaha = { path = "../../peripherals/yamaha" }

2
emulator/frontends/minifb/src/bin/moa-genesis.rs
View File

@ -1,7 +1,7 @@
use clap::Arg;
use moa_genesis::{build_genesis, SegaGenesisOptions};
use moa_systems_genesis::{build_genesis, SegaGenesisOptions};
fn main() {
let matches = moa_minifb::new("Sega Genesis/Mega Drive Emulator")

2
emulator/frontends/minifb/src/bin/moa-macintosh.rs
View File

@ -1,5 +1,5 @@
use moa_macintosh::build_macintosh_512k;
use moa_systems_macintosh::build_macintosh_512k;
fn main() {
let matches = moa_minifb::new("Macintosh 512k Emulator")

2
emulator/frontends/minifb/src/bin/moa-trs80.rs
View File

@ -1,7 +1,7 @@
use clap::Arg;
use moa_trs80::{build_trs80, Trs80Options};
use moa_systems_trs80::{build_trs80, Trs80Options};
fn main() {
let matches = moa_minifb::new("TRS-80 Emulator")

2
emulator/frontends/pixels/Cargo.toml
View File

@ -11,7 +11,7 @@ winit = "0.26"
moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["audio"] }
moa_genesis = { path = "../../systems/genesis" }
moa_systems_genesis = { path = "../../systems/genesis" }
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1"

2
emulator/frontends/pixels/src/bin/moa-genesis.rs
View File

@ -2,7 +2,7 @@
use moa_pixels::{PixelsFrontend, start};
use moa_core::{System, Error};
use moa_genesis::{SegaGenesisOptions, build_genesis};
use moa_systems_genesis::{SegaGenesisOptions, build_genesis};
fn load_system(host: &mut PixelsFrontend, rom_data: Vec<u8>) -> Result<System, Error> {
let mut options = SegaGenesisOptions::default();

2
emulator/systems/computie/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "moa_computie"
name = "moa_systems_computie"
version = "0.1.0"
edition = "2021"

2
emulator/systems/genesis/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "moa_genesis"
name = "moa_systems_genesis"
version = "0.1.0"
edition = "2021"

2
emulator/systems/macintosh/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "moa_macintosh"
name = "moa_systems_macintosh"
version = "0.1.0"
edition = "2021"

2
emulator/systems/trs80/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "moa_trs80"
name = "moa_systems_trs80"
version = "0.1.0"
edition = "2021"