From 4d4a83ddcbe20d14539f02d01cd107440aa11963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com> Date: Sat, 25 Jun 2022 21:12:02 +0100 Subject: [PATCH] feat: initial support for the example --- Cargo.toml | 6 +++++ examples/sdl/Cargo.toml | 23 ++++++++++++++++++ .../sdl/res/dmg_rom.bin | Bin examples/sdl/src/main.rs | 6 +++++ res/dmg_rom.bin | Bin 0 -> 256 bytes src/gb.rs | 2 +- 6 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 examples/sdl/Cargo.toml rename res/mbr_rom.bin => examples/sdl/res/dmg_rom.bin (100%) create mode 100644 examples/sdl/src/main.rs create mode 100644 res/dmg_rom.bin diff --git a/Cargo.toml b/Cargo.toml index f4f8535c..97404194 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,3 +20,9 @@ wasm-bindgen = { version = "0.2", optional = true } debug = false lto = true opt-level = 3 + +[workspace] +members = [ + ".", + "examples/sdl", +] diff --git a/examples/sdl/Cargo.toml b/examples/sdl/Cargo.toml new file mode 100644 index 00000000..ee812348 --- /dev/null +++ b/examples/sdl/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "boytacean-sdl" +version = "0.1.0" +authors = ["João Magalhães <joamag@gmail.com>"] +description = "Game Boy Emulator SDL (Desktop) Application" +license = "Apache-2.0" +keywords = ["gameboy", "emulator", "rust", "sdl"] +edition = "2018" + +[dependencies.boytacean] +path = "../.." + +[dependencies.sdl2] +version = "0.35" +features = ["ttf", "image", "gfx", "mixer", "static-link", "use-vcpkg"] + +[package.metadata.vcpkg] +dependencies = ["sdl2", "sdl2-image[libjpeg-turbo,tiff,libwebp]", "sdl2-ttf", "sdl2-gfx", "sdl2-mixer"] +git = "https://github.com/microsoft/vcpkg" +rev = "261c458af6e3eed5d099144aff95d2b5035f656b" + +[package.metadata.vcpkg.target] +x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md" } diff --git a/res/mbr_rom.bin b/examples/sdl/res/dmg_rom.bin similarity index 100% rename from res/mbr_rom.bin rename to examples/sdl/res/dmg_rom.bin diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs new file mode 100644 index 00000000..e7781244 --- /dev/null +++ b/examples/sdl/src/main.rs @@ -0,0 +1,6 @@ +use boytacean::gb::GameBoy; + +fn main() { + let mut game_boy = GameBoy::new(); + game_boy.load_boot_default() +} diff --git a/res/dmg_rom.bin b/res/dmg_rom.bin new file mode 100644 index 0000000000000000000000000000000000000000..afa0ee4792c2ba80afb6b0c1962e249e195e6fc0 GIT binary patch literal 256 zcmV+b0ssCn{{OEb|DQ6;d?5QFCjSl*K7caf3_kPXGCp^AKK$TE5d;At5P%xZl>p6_ z026!uG$8X4*Z>9y8WSQT1t9r88R`(3AupK@3_U0aG7TX4E)N*<XFg<C;6gr;;6MZ( z0uBuDME;N<`VAoW9U$@!6C`{dgZ^SD1|GrwWFQ86;tW2A;_yO{;6fE3(gh$-79beQ zPX+|V%MlmB%Mlj^AoU_6A|uJp?Pg}o4FC%Ra{z+?3;+!P2oWEMi2x4V%x>o0-PxJD zyJur=4(!a`+?k)dxidaILb;{6r9wO*1OXAK02&j%ApRqL{xl%<1{rvUBLyJ)h9Lev G0pL*XS7L7f literal 0 HcmV?d00001 diff --git a/src/gb.rs b/src/gb.rs index 1d03e62f..a3fd8799 100644 --- a/src/gb.rs +++ b/src/gb.rs @@ -22,6 +22,6 @@ impl GameBoy { } pub fn load_boot_default(&mut self) { - self.load_boot("./res/mbr_rom.bin"); + self.load_boot("./res/dmg_rom.bin"); } } -- GitLab