Skip to content

Commit 65cb0f4

Browse files
Merge pull request #1 from Neotron-Compute/mac_fixes_and_basic_hid
Mac fixes and basic hid
2 parents 8b1b330 + 4614204 commit 65cb0f4

File tree

5 files changed

+349
-39
lines changed

5 files changed

+349
-39
lines changed

.github/workflows/rust.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v1
1212
- name: Build
13-
run: cargo build --verbose
13+
run: |
14+
sudo apt-get update -y
15+
sudo apt-get install -y libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-gfx-dev
16+
cargo build --verbose

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ Cargo.lock
88

99
# These are backup files generated by rustfmt
1010
**/*.rs.bk
11+
12+
# Shared libraries from OS build
13+
*.dylib
14+
*.so

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license-file = "LICENSE"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
neotron-common-bios = "0.6.1"
12+
neotron-common-bios = "0.7"
1313
libloading = "0.7"
1414
pix-engine = "0.5.4"
1515
env_logger = "0.9"

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ This is the [Neotron](https://github.com/neotron-compute) BIOS that lets you run
1010

1111
This BIOS uses [pix-engine](https://crates.io/crates/pix-engine), so should run on any platform that pix-engine supports.
1212

13+
If you have a Mac, run:
14+
15+
```console
16+
$ brew install sdl2
17+
$ brew install sdl2_mixer
18+
$ brew install sdl2_image
19+
$ export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
20+
```
21+
22+
You will need to re-run the `export` command before you re-build the application.
23+
1324
## Building
1425

1526
Build and run this BIOS (and use it to boot Neotron OS) with...

0 commit comments

Comments
 (0)