Skip to content

Commit

Permalink
build: fix wasm builds
Browse files Browse the repository at this point in the history
  • Loading branch information
yusdacra committed Nov 28, 2024
1 parent 65fb134 commit 5486bac
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ it's just a standard rust project under `rust`, so make sure you have `rustup` i
also don't forget to have godot installed and available in your `PATH` (the extension currently targets 4.3).

- **cargo features**
- enable `stats` feature to let the extension log into godot console some times for how its processing the boids.
- enable `stats` feature to let the extension log into godot console timings for how long its processing the boids.

## todo

Expand Down
18 changes: 9 additions & 9 deletions addons/boids/boids.gdextension
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ linux.debug.x86_64 = "res://addons/boids/lib/boids.x86_64.so"
linux.release.x86_64 = "res://addons/boids/lib/boids.x86_64.so"
windows.debug.x86_64 = "res://addons/boids/lib/boids.x86_64.dll"
windows.release.x86_64 = "res://addons/boids/lib/boids.x86_64.dll"
macos.release = "res://addons/boids/lib/libboids.x86_64.dylib"
macos.release.arm64 = "res://addons/boids/lib/libboids.arm64.dylib"
web.debug.wasm32 = "res://addons/boids/lib/boids.wasm32.wasm"
web.release.wasm32 = "res://addons/boids/lib/boids.wasm32.wasm"
macos.release = "res://addons/boids/lib/boids.x86_64.dylib"
macos.release.arm64 = "res://addons/boids/lib/boids.arm64.dylib"
web.debug.wasm32 = "res://addons/boids/lib/boids.wasm"
web.release.wasm32 = "res://addons/boids/lib/boids.wasm"

[icons]
BoidProperties = "res://addons/boids/resources/boid_properties.svg"
BoidProperties = "res://addons/boids/resources/boid_properties.svg"
FlockProperties = "res://addons/boids/resources/flock_properties.svg"
Flock2D = "res://addons/boids/resources/flock_2d.svg"
Boid2D = "res://addons/boids/resources/boid_2d.svg"
Flock3D = "res://addons/boids/resources/flock_3d.svg"
Boid3D = "res://addons/boids/resources/boid_3d.svg"
Flock2D = "res://addons/boids/resources/flock_2d.svg"
Boid2D = "res://addons/boids/resources/boid_2d.svg"
Flock3D = "res://addons/boids/resources/flock_3d.svg"
Boid3D = "res://addons/boids/resources/boid_3d.svg"
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ _just-cmd *FLAGS="":
build $target=(host-target) *FLAGS="": _setup-env
cd rust; cross build {{FLAGS}} --profile {{profile}} --target {{target}}
install $target=(host-target): _setup-env
mv -f rust/target/{{target}}/{{`$env.profiledir`}}/{{`$env.libprefix`}}boids.{{`$env.ext`}} {{artifact-dir}}/boids.{{`$env.arch`}}.{{`$env.ext`}}
mv -f rust/target/{{target}}/{{`$env.profiledir`}}/{{`$env.libprefix`}}boids.{{`$env.ext`}} {{artifact-dir}}/boids{{`$env.arch`}}.{{`$env.ext`}}
build-install target=(host-target) *FLAGS="": (build target FLAGS) (install target)

wasm: (build-install 'wasm32-unknown-emscripten' '+nightly' '-Zbuild-std')
Expand Down
9 changes: 8 additions & 1 deletion justfile.nu
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ let exts = {

def getext [] { $exts | get $env.target }
def getlibprefix [] { if ($env.target | str contains "linux") { "lib" } else { "" } }
def getarch [] { $env.target | split row - | first }
def getarch [] {
let arch = $env.target | split row - | first
if ($arch == "wasm32") {
""
} else {
"." + $arch
}
}
def getprofiledir [] { if ($env.profile == 'dev') { "debug" } else { $env.profile }}

def main [command: string] {
Expand Down
1 change: 1 addition & 0 deletions rust/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ rustflags = [
"-C", "link-args=-sSIDE_MODULE=2",
"-C", "link-args=-pthread", # was -sUSE_PTHREADS=1 in earlier emscripten versions
"-C", "target-feature=+atomics,+bulk-memory,+mutable-globals",
"-Cllvm-args=-enable-emscripten-cxx-exceptions=0",
"-Zlink-native-libraries=no"
]

0 comments on commit 5486bac

Please sign in to comment.