Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
[build]
target = "i686-pc-windows-msvc"

[target.i686-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static"]
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install pinned nightly + i686 target
- name: Install stable + i686 target
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-11-06
toolchain: stable
targets: i686-unknown-linux-gnu

- name: Install i386 deps
Expand Down Expand Up @@ -77,10 +77,10 @@ jobs:
apt-get update
apt-get install -y build-essential curl make g++-multilib

- name: Install pinned nightly + i686 target
- name: Install stable + i686 target
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-11-06
toolchain: stable
targets: i686-unknown-linux-gnu

- uses: actions/checkout@v4
Expand Down Expand Up @@ -158,10 +158,10 @@ jobs:
mv libcef.lib $CEF_PATH/libcef.lib
shell: bash

- name: Install pinned nightly + i686 target (MSVC)
- name: Install stable + i686 target (MSVC)
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-11-06
toolchain: stable
targets: i686-pc-windows-msvc

- name: Cache cargo registry
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
.idea
/linux-build
deploy.cmd
/third_party
.xwin
Loading
Loading