diff --git a/.cargo/config.toml b/.cargo/config.toml
new file mode 100644
index 0000000..d3d5e72
--- /dev/null
+++ b/.cargo/config.toml
@@ -0,0 +1,13 @@
+[target.x86_64-unknown-linux-gnu]
+rustflags = ["-Zshare-generics=y"]
+
+# [target.x86_64-apple-darwin]
+# rustflags = [
+#   "-C",
+#   "link-arg=-fuse-ld=/usr/local/bin/zld",
+#   "-Zshare-generics=y",
+#   "-Zrun-dsymutil=no",
+# ]
+
+[target.x86_64-pc-windows-gnu]
+rustflags = ["-Zshare-generics=y"]
diff --git a/Cargo.toml b/Cargo.toml
index 4b958d6..8ded452 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,9 +2,8 @@
 name = "martian-chess"
 version = "0.1.0"
 edition = "2021"
+build = "build.rs"
 
 [dependencies]
 bevy_fmod = "0.3"
-
-[dependencies.bevy]
-version = "0.11"
+bevy = "0.11"
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 0000000..2079433
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,2 @@
+[target.x86_64-unknown-linux-gnu]
+dockerfile = "target/x86_64-unknown-linux-gnu/Dockerfile"
diff --git a/README.md b/README.md
index bddd0eb..e962b97 100644
--- a/README.md
+++ b/README.md
@@ -50,3 +50,7 @@ Package web version with WASM libraries
 
 Linux: https://appimage.org/
 Windows: 
+
+FMOD PR:
+* Sane default for CARGO_MANIFEST_DIR
+* Linux library instructions
diff --git a/build.rs b/build.rs
new file mode 100644
index 0000000..252bda1
--- /dev/null
+++ b/build.rs
@@ -0,0 +1,5 @@
+fn main() {
+    println!("cargo:rustc-link-lib=fmod");
+    println!("cargo:rustc-link-lib=fmodstudio");
+    println!("cargo:rustc-link-search=lib/linux");
+}
diff --git a/src/main.rs b/src/main.rs
index bd95db4..ef2b271 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+#![windows_subsystem = "windows"]
+
 mod audio;
 mod debug;
 mod display2d;
diff --git a/target/x86_64-unknown-linux-gnu/Dockerfile b/target/x86_64-unknown-linux-gnu/Dockerfile
new file mode 100644
index 0000000..b886343
--- /dev/null
+++ b/target/x86_64-unknown-linux-gnu/Dockerfile
@@ -0,0 +1,14 @@
+
+FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:0.2.5
+
+RUN apt-get update && \
+    apt-get install --assume-yes \
+        g++ \
+        libasound2-dev \
+        libudev-dev \
+        libwayland-dev \
+        libx11-dev \
+        libxkbcommon-dev \
+        mesa-vulkan-drivers \
+        pkg-config ;
+