Refactor project workspace and fix build

Former-commit-id: 8e264cdbc9e5290654c29e6893a121bce73c29c9
This commit is contained in:
Michel Heily 2020-04-10 00:51:23 +03:00
parent 3db61d1804
commit b21cd1e3d9
100 changed files with 10 additions and 8 deletions

View file

@ -6,9 +6,9 @@ edition = "2018"
[workspace]
members = [
"rustboyadvance-sdl2",
"rustboyadvance-minifb",
"rustboyadvance-jni",
"platform/rustboyadvance-sdl2",
"platform/rustboyadvance-minifb",
"bindings/rustboyadvance-jni",
]
[dependencies]

View file

@ -10,7 +10,7 @@ publish = false
crate-type = ["staticlib", "cdylib"]
[dependencies]
rustboyadvance-ng = {path = "../"}
rustboyadvance-ng = {path = "../../"}
jni = { version = "0.14", default-features = false }
log = {version = "0.4.8", features = ["release_max_level_info", "max_level_debug"]}
ringbuf = "0.2.1"

View file

@ -25,7 +25,7 @@ cargo {
prebuiltToolchains = true
verbose = true
profile = 'release'
module = "../../rustboyadvance-jni"
module = "../../bindings/rustboyadvance-jni"
targetDirectory = '../../target'
libname = "rustboyadvance_jni"
targets = ['x86', 'arm64']

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View file

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2 KiB

View file

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

View file

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View file

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

View file

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

View file

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -5,7 +5,7 @@ authors = ["Michel Heily <michelheily@gmail.com>"]
edition = "2018"
[dependencies]
rustboyadvance-ng = {path = "../"}
rustboyadvance-ng = {path = "../../"}
minifb = "0.11.2"
clap = {version = "2.33", features = ["color", "yaml"]}
bit = "^0.1"

View file

@ -5,7 +5,7 @@ authors = ["Michel Heily <michelheily@gmail.com>"]
edition = "2018"
[dependencies]
rustboyadvance-ng = {path = "../"}
rustboyadvance-ng = {path = "../../"}
sdl2 = {version = "0.33.0", features = ["image"]}
ringbuf = "0.2.1"
bytesize = "1.0.0"

View file

@ -4,7 +4,7 @@ use winres;
#[cfg(windows)]
fn main() {
let mut res = winres::WindowsResource::new();
res.set_icon("../assets/icon.ico");
res.set_icon("../../assets/icon.ico");
res.compile().unwrap();
}

View file

@ -85,6 +85,8 @@ impl GameBoyAdvance {
input_device: input_device,
cycles_to_next_event: 1,
overshoot_cycles: 0,
})
}