Skip to content

Commit

Permalink
Fix web builds. Double builds part 1 impl (#282)
Browse files Browse the repository at this point in the history
Double builds almost done, just need to specify godot path for
godot-rust builds.

- Fixes #293
Forgot the debug option on. Now the web builds have about 1.4MB.
  • Loading branch information
Ughuuu authored Oct 31, 2024
1 parent b586afa commit 6568720
Show file tree
Hide file tree
Showing 80 changed files with 341 additions and 3,492 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.nothreads.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ linker = "aarch64-linux-android23-clang"
[target.x86_64-linux-android]
linker = "x86_64-linux-android23-clang"
[target.i686-linux-android]
linker = "i686-linux-android23-clang"
linker = "i686-linux-android23-clang"
27 changes: 11 additions & 16 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
[target.wasm32-unknown-emscripten]
rustflags = [
"-C",
"link-args=-sSIDE_MODULE=2",
"-C",
"link-args=-pthread",
"-C",
"target-feature=+atomics,+bulk-memory,+mutable-globals",
"-Clink-args=-sEXPORT_ALL=1",
"-Clink-arg=-fwasm-exceptions",
"-C",
"link-args=-sSUPPORT_LONGJMP=wasm",
"-Cllvm-args=-enable-emscripten-cxx-exceptions=0",
"-Cllvm-args=-wasm-enable-sjlj",
"-C",
"link-args=-sDISABLE_EXCEPTION_CATCHING=1",
"-Zlink-native-libraries=no",
"-C", "link-args=-sSIDE_MODULE=2",
"-C", "link-args=-pthread",
"-C", "target-feature=+atomics,+bulk-memory,+mutable-globals",
"-C", "link-args=-sEXPORT_ALL=1",
"-C", "link-arg=-fwasm-exceptions",
"-C", "link-args=-sSUPPORT_LONGJMP=wasm",
"-C", "llvm-args=-enable-emscripten-cxx-exceptions=0",
"-C", "llvm-args=-wasm-enable-sjlj",
"-C", "link-args=-sDISABLE_EXCEPTION_CATCHING=1",
"-Z", "link-native-libraries=no",
]
[target.armv7-linux-androideabi]
linker = "armv7a-linux-androideabi23-clang"
Expand All @@ -23,4 +18,4 @@ linker = "aarch64-linux-android23-clang"
[target.x86_64-linux-android]
linker = "x86_64-linux-android23-clang"
[target.i686-linux-android]
linker = "i686-linux-android23-clang"
linker = "i686-linux-android23-clang"
2 changes: 1 addition & 1 deletion .github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
# disabled_arch: ["armv7-linux-androideabi"]
arch: ["x86_64-linux-android", "aarch64-linux-android", "i686-linux-android"]
precision: [single]
precision: [single] #, double]
dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
features: [{"feature":"simd-stable,serde-serialize,experimental-threads", "name": "simd-parallel"}, {"feature":"enhanced-determinism,serde-serialize,experimental-threads", "name": "enhanced-determinism"}]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/godot_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
precision: [single]
precision: [single] #, double]
dimensions: ["2d", "3d"]
features: ["simd-parallel", "enhanced-determinism"]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
arch: ["aarch64-apple-ios"]
precision: [single]
precision: [single] #, double]
dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
features: [{"feature":"simd-stable,serde-serialize,experimental-threads", "name": "simd-parallel"}, {"feature":"enhanced-determinism,serde-serialize,experimental-threads", "name": "enhanced-determinism"}]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
matrix:
#arch: ["i686-unknown-linux-gnu", "aarch64-unknown-linux-gnu"]
arch: ["x86_64-unknown-linux-gnu"]
precision: [single]
precision: [single] #, double]
dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
features: [{"feature":"simd-stable,serde-serialize,experimental-threads", "name": "simd-parallel"}, {"feature":"enhanced-determinism,serde-serialize,experimental-threads", "name": "enhanced-determinism"}]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
arch: ["x86_64-apple-darwin"]
precision: [single]
precision: [single] #, double]
dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
features: [{"feature":"simd-stable,serde-serialize,experimental-threads", "name": "simd-parallel"}, {"feature":"enhanced-determinism,serde-serialize,experimental-threads", "name": "enhanced-determinism"}]

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
shell: sh
run: |
cargo clippy --all-targets --features="build3d" --no-default-features -- -D warnings
gdlint:
name: GDLint
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
arch: ["wasm32-unknown-emscripten"]
precision: [single]
precision: [single] #, double]
build_param: [
{ "feature": "experimental-wasm", "folder": "" },
{ "feature": "experimental-wasm,experimental-wasm-nothreads", "folder": "wasm-nothreads" } ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
arch: ["x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "aarch64-pc-windows-msvc"]
precision: [single]
precision: [single] #, double]
dimensions: [{"feature": "dim2", "short": "2d"}, {"feature": "dim3", "short": "3d"}]
features: [{"feature":"simd-stable,serde-serialize,experimental-threads", "name": "simd-parallel"}, {"feature":"enhanced-determinism,serde-serialize,experimental-threads", "name": "enhanced-determinism"}]

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v0.8.9

- Reduce size of builds

## v0.8.8

- Fix points getting removed and empty points warning.
Expand Down
Loading

0 comments on commit 6568720

Please sign in to comment.