Merge branch 'main' into feature/feature-flags

pd-rs · Sep 13, 2023 · 0413c11 · 0413c11
2 parents 0c5b466 + 7eea747
commit 0413c11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@ This software is not sponsored or supported by Panic.
  * Switch to the nightly toolchain using `rustup toolchain install nightly`, required for the `build-std` feature.
  * If you want to build for the Playdate device, you will need the `thumbv7em-none-eabihf` target. Added with `rustup +nightly target add thumbv7em-none-eabihf`
  * All the requirements listed in [Inside Playdate with C](https://sdk.play.date/inside-playdate-with-c#_prerequisites).
+     * The GCC ARM compiler must be available in your system `PATH` environment variable. (This is usually done for you by the installer).
 
 ## Installation
 

diff --git a/src/main.rs b/src/main.rs
@@ -28,8 +28,7 @@ const GCC_PATH_STR: &'static str = "/usr/local/bin/arm-none-eabi-gcc";
 #[cfg(all(unix, not(target_os = "macos")))]
 const GCC_PATH_STR: &'static str = "arm-none-eabi-gcc";
 #[cfg(windows)]
-const GCC_PATH_STR: &'static str =
-    r"C:\Program Files (x86)\GNU Tools Arm Embedded\9 2019-q4-major\bin\arm-none-eabi-gcc.exe";
+const GCC_PATH_STR: &'static str = "arm-none-eabi-gcc.exe";
 
 #[cfg(unix)]
 #[allow(unused)]