Skip to content

Commit

Permalink
Merge pull request #12 from zzlk/main
Browse files Browse the repository at this point in the history
Fix building on WSL2
  • Loading branch information
zzlk authored Jan 15, 2025
2 parents d95b7da + db16e5c commit d227919
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
26 changes: 25 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
To one the runbox you need two terminals.
General:

- This repo uses submodules. Make sure to clone with --recurse-submodules
- Recommended plugins:
- rust analyzer
- prettier

Linux:

- Rust needs to be installed.

Windows:

- WSL2 is required to build on windows. https://learn.microsoft.com/en-us/windows/wsl/install
- Make sure Rust is installed. https://www.rust-lang.org/tools/install
- pkg-config is needed. `sudo apt-get install pkg-config`
- openssl libraries are needed. `sudo apt-get install libssl-dev`
- `sudo apt-get install build-essential`
- Watch out for windows line endings, various libraries like zlib will fail to build with windows line endings.

OSX:

- Good luck.

To one the runbox you need two terminals:

- use `make run` to run the backend + database
- use `make dev` to run the front-end
2 changes: 1 addition & 1 deletion crates/compact_enc_det-bindings/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::path::PathBuf;
use std::process::Command;

fn main() {
assert!(Command::new("sh")
assert!(Command::new("bash")
.current_dir("compact_enc_det")
.args(&["./autogen.sh"])
.status()
Expand Down
2 changes: 1 addition & 1 deletion crates/compact_enc_det-bindings/compact_enc_det
Submodule compact_enc_det updated 1 files
+2 −2 autogen.sh
6 changes: 3 additions & 3 deletions crates/stormlib-bindings/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::process::Command;
fn main() {
assert!(Command::new("cmake")
.current_dir("StormLib")
.args(&["CMakeLists.txt", "--fresh"])
.args(&["CMakeLists.txt"])
.status()
.expect("failed to cmake")
.success());
Expand All @@ -22,7 +22,7 @@ fn main() {

assert!(Command::new("cmake")
.current_dir("bzip2")
.args(&["CMakeLists.txt", "-DENABLE_STATIC_LIB=1", "--fresh"])
.args(&["CMakeLists.txt", "-DENABLE_STATIC_LIB=1"])
.status()
.expect("failed to cmake")
.success());
Expand All @@ -34,7 +34,7 @@ fn main() {
.expect("failed to make!")
.success());

assert!(Command::new("/bin/sh")
assert!(Command::new("bash")
.current_dir("zlib")
.args(&["./configure"])
.status()
Expand Down
2 changes: 1 addition & 1 deletion crates/uchardet-bindings/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::process::Command;
fn main() {
assert!(Command::new("cmake")
.current_dir("uchardet")
.args(&["CMakeLists.txt", "--fresh"])
.args(&["CMakeLists.txt"])
.status()
.expect("failed to cmake")
.success());
Expand Down

0 comments on commit d227919

Please sign in to comment.