Skip to content

Commit

Permalink
Merge branch 'release/v0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
thejpster committed Feb 12, 2023
2 parents b275a18 + 5f01d19 commit 4451c70
Show file tree
Hide file tree
Showing 8 changed files with 346 additions and 691 deletions.
9 changes: 0 additions & 9 deletions CHANGELOG.MD

This file was deleted.

19 changes: 19 additions & 0 deletions CHANGELOG.md
@@ -0,0 +1,19 @@
# Change Log

## v0.3.0

* Updated to Neotron Common BIOS v0.8.0
* Use pc-keyboard for decoding HID events
* Fix Windows library build
* Added 'kbtest' command
* Added 'lshw' command
* Added 'config' command
* Uses BIOS to store/load OS configuration

## v0.2.0

Adds HID support and basic shell, with 'mem' and 'fill' commands.

## v0.1.0

First version.
5 changes: 3 additions & 2 deletions Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "neotron-os"
version = "0.2.0"
version = "0.3.0"
authors = ["Jonathan 'theJPster' Pallant <github@thejpster.org.uk>"]
edition = "2018"
description = "The Neotron Operating System"
Expand Down Expand Up @@ -37,7 +37,8 @@ panic = "abort"
panic = "abort"

[dependencies]
neotron-common-bios = "0.7"
neotron-common-bios = "0.8"
pc-keyboard = "0.7"
r0 = "1.0"
postcard = "0.5"
serde = { version = "1.0", default-features = false }
Expand Down
5 changes: 1 addition & 4 deletions README.md
Expand Up @@ -51,10 +51,7 @@ $ ls ./target/debug/*.so

## Changelog

### Unreleased Changes ([Source](https://github.com/neotron-compute/Neotron-OS/tree/master))

* Basic `println!` to the text buffer.
* Re-arranged linker script setup
See [`CHANGELOG.md`](./CHANGELOG.md)

## Licence

Expand Down
9 changes: 7 additions & 2 deletions build.rs
Expand Up @@ -23,6 +23,11 @@ fn main() {
println!("cargo:rustc-env=OS_VERSION={}", env!("CARGO_PKG_VERSION"));
}

#[cfg(target_os = "macos")]
println!("cargo:rustc-link-lib=c");
if Ok("macos") == env::var("CARGO_CFG_TARGET_OS").as_deref() {
println!("cargo:rustc-link-lib=c");
}

if Ok("windows") == env::var("CARGO_CFG_TARGET_OS").as_deref() {
println!("cargo:rustc-link-lib=dylib=msvcrt");
}
}

0 comments on commit 4451c70

Please sign in to comment.