Skip to content

Commit

Permalink
Merge pull request #84 from alloncm/dev
Browse files Browse the repository at this point in the history
Version 2.1
  • Loading branch information
alloncm authored Apr 22, 2022
2 parents 66066c0 + edcc368 commit 07eb884
Show file tree
Hide file tree
Showing 42 changed files with 1,167 additions and 513 deletions.
172 changes: 165 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@ magenboy [path_to_rom] [other_optional_flags]
* `--full-screen` - Full screen mode
* `--no-vsync` - Disable vsync
* `--bootrom [path to bootrom file]` - Specify the path for a bootrom (If not specified the emualtor will look for `dmg_boot.bin` at the cwd)
* `--rom_menu [path to roms folder]` - Opens an interactive dialog uopn start to choose the rom from the folder

### Building

```shell
cargo build --release --features [optional_features]
```
#### Optional features:
* static-sdl - will link statically to sdl2.
On by default (to turn off pass `--no-default-features`)
* sdl-resample - Use the audio resampler from sdl2 library and a manual one I wrote
* push-audio - Use a push methododlogy instead of pull for the delivery of the sound samples to sdl2
* static-scale - Will use a fixed scale values for the renderer instead of addapting to the screen size

## GameBoy

Expand Down
3 changes: 2 additions & 1 deletion gb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gb"
version = "1.0.0"
version = "2.1.0"
authors = ["alloncm <[email protected]>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -18,6 +18,7 @@ sdl2 = "0.34"
wav = "1.0"
crossbeam-channel = "0.5"
cfg-if = "1.0"
crossterm = "0.23"

[features]
default = ["static-sdl"]
Expand Down
Loading

0 comments on commit 07eb884

Please sign in to comment.