Refactor project workspace and fix build
Former-commit-id: 8e264cdbc9e5290654c29e6893a121bce73c29c9
Michel Heily
|
|
@ -6,9 +6,9 @@ edition = "2018"
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = [
|
members = [
|
||||||
"rustboyadvance-sdl2",
|
"platform/rustboyadvance-sdl2",
|
||||||
"rustboyadvance-minifb",
|
"platform/rustboyadvance-minifb",
|
||||||
"rustboyadvance-jni",
|
"bindings/rustboyadvance-jni",
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ publish = false
|
||||||
crate-type = ["staticlib", "cdylib"]
|
crate-type = ["staticlib", "cdylib"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rustboyadvance-ng = {path = "../"}
|
rustboyadvance-ng = {path = "../../"}
|
||||||
jni = { version = "0.14", default-features = false }
|
jni = { version = "0.14", default-features = false }
|
||||||
log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]}
|
log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]}
|
||||||
ringbuf = "0.2.1"
|
ringbuf = "0.2.1"
|
||||||
|
|
@ -25,7 +25,7 @@ cargo {
|
||||||
prebuiltToolchains = true
|
prebuiltToolchains = true
|
||||||
verbose = true
|
verbose = true
|
||||||
profile = 'release'
|
profile = 'release'
|
||||||
module = "../../rustboyadvance-jni"
|
module = "../../bindings/rustboyadvance-jni"
|
||||||
targetDirectory = '../../target'
|
targetDirectory = '../../target'
|
||||||
libname = "rustboyadvance_jni"
|
libname = "rustboyadvance_jni"
|
||||||
targets = ['x86', 'arm64']
|
targets = ['x86', 'arm64']
|
||||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.4 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
|
@ -5,7 +5,7 @@ authors = ["Michel Heily <michelheily@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rustboyadvance-ng = {path = "../"}
|
rustboyadvance-ng = {path = "../../"}
|
||||||
minifb = "0.11.2"
|
minifb = "0.11.2"
|
||||||
clap = {version = "2.33", features = ["color", "yaml"]}
|
clap = {version = "2.33", features = ["color", "yaml"]}
|
||||||
bit = "^0.1"
|
bit = "^0.1"
|
||||||
|
|
@ -5,7 +5,7 @@ authors = ["Michel Heily <michelheily@gmail.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rustboyadvance-ng = {path = "../"}
|
rustboyadvance-ng = {path = "../../"}
|
||||||
sdl2 = {version = "0.33.0", features = ["image"]}
|
sdl2 = {version = "0.33.0", features = ["image"]}
|
||||||
ringbuf = "0.2.1"
|
ringbuf = "0.2.1"
|
||||||
bytesize = "1.0.0"
|
bytesize = "1.0.0"
|
||||||
|
|
@ -4,7 +4,7 @@ use winres;
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut res = winres::WindowsResource::new();
|
let mut res = winres::WindowsResource::new();
|
||||||
res.set_icon("../assets/icon.ico");
|
res.set_icon("../../assets/icon.ico");
|
||||||
res.compile().unwrap();
|
res.compile().unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -85,6 +85,8 @@ impl GameBoyAdvance {
|
||||||
input_device: input_device,
|
input_device: input_device,
|
||||||
|
|
||||||
cycles_to_next_event: 1,
|
cycles_to_next_event: 1,
|
||||||
|
|
||||||
|
overshoot_cycles: 0,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||