Modified to use crates.io version of femtos

This commit is contained in:
transistor 2024-02-24 19:16:46 -08:00
parent 2a0918d8bd
commit 671517aab7
20 changed files with 36 additions and 18 deletions

17
Cargo.lock generated
View File

@ -463,6 +463,8 @@ dependencies = [
[[package]] [[package]]
name = "femtos" name = "femtos"
version = "0.1.0" version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b90ac969e2dfcc103ec34948f65290b7616edc460922bd6d33ad75f525964f7d"
[[package]] [[package]]
name = "flate2" name = "flate2"
@ -575,6 +577,12 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "iz80"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76e13cd358184c4b647f19a858246b82e3327ed29c2893d232f01ed016ac5d3c"
[[package]] [[package]]
name = "jni" name = "jni"
version = "0.19.0" version = "0.19.0"
@ -724,6 +732,15 @@ dependencies = [
"adler", "adler",
] ]
[[package]]
name = "moa-iz80"
version = "0.1.0"
dependencies = [
"femtos",
"iz80",
"moa_core",
]
[[package]] [[package]]
name = "moa_audio" name = "moa_audio"
version = "0.1.0" version = "0.1.0"

View File

@ -4,6 +4,7 @@ members = [
"emulator/frontends/common", "emulator/frontends/common",
"emulator/frontends/console", "emulator/frontends/console",
"emulator/frontends/minifb", "emulator/frontends/minifb",
"emulator/cpus/moa-iz80",
"tests/harte_tests", "tests/harte_tests",
"tests/rad_tests" "tests/rad_tests"
] ]

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../libraries/femtos" } femtos = "0.1"

View File

@ -5,6 +5,6 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_parsing = { path = "../../libraries/parsing" } moa_parsing = { path = "../../libraries/parsing" }

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }

View File

@ -9,7 +9,7 @@ audio = ["cpal"]
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
nix = { version = "0.25", optional = true } nix = { version = "0.25", optional = true }

View File

@ -8,7 +8,7 @@ default-run = "moa-computie"
log = "0.4" log = "0.4"
clap = "^4" clap = "^4"
simple_logger = "^2" simple_logger = "^2"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["tty"] } moa_common = { path = "../common", features = ["tty"] }

View File

@ -9,7 +9,7 @@ log = "0.4"
minifb = "^0.19" minifb = "^0.19"
clap = "^4" clap = "^4"
simple_logger = "^2" simple_logger = "^2"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["audio"] } moa_common = { path = "../common", features = ["audio"] }

View File

@ -7,7 +7,7 @@ edition = "2021"
log = "0.4" log = "0.4"
pixels = "0.12" pixels = "0.12"
winit = "0.28" winit = "0.28"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_common = { path = "../common", features = ["audio"] } moa_common = { path = "../common", features = ["audio"] }

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
log = "^0.4" log = "^0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_audio = { path = "../../libraries/audio" } moa_audio = { path = "../../libraries/audio" }
lazy_static = "1.4.0" lazy_static = "1.4.0"

View File

@ -5,5 +5,5 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_m68k = { path = "../../cpus/m68k" } moa_m68k = { path = "../../cpus/m68k" }
moa_peripherals_generic = { path = "../../peripherals/generic" } moa_peripherals_generic = { path = "../../peripherals/generic" }

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_peripherals_yamaha = { path = "../../peripherals/yamaha" } moa_peripherals_yamaha = { path = "../../peripherals/yamaha" }
moa_m68k = { path = "../../cpus/m68k" } moa_m68k = { path = "../../cpus/m68k" }

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_m68k = { path = "../../cpus/m68k" } moa_m68k = { path = "../../cpus/m68k" }
moa_peripherals_mos = { path = "../../peripherals/mos" } moa_peripherals_mos = { path = "../../peripherals/mos" }

View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
log = "0.4" log = "0.4"
femtos = { path = "../../libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../core" } moa_core = { path = "../../core" }
moa_z80 = { path = "../../cpus/z80" } moa_z80 = { path = "../../cpus/z80" }

View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
femtos = { path = "../../emulator/libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../emulator/core" } moa_core = { path = "../../emulator/core" }
moa_m68k = { path = "../../emulator/cpus/m68k" } moa_m68k = { path = "../../emulator/cpus/m68k" }

View File

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
femtos = { path = "../../emulator/libraries/femtos" } femtos = "0.1"
moa_core = { path = "../../emulator/core" } moa_core = { path = "../../emulator/core" }
moa_z80 = { path = "../../emulator/cpus/z80" } moa_z80 = { path = "../../emulator/cpus/z80" }
serde = "1.0" serde = "1.0"