oodle: Fix linking statically #121

Merged
lucas merged 8 commits from issue/static-linking into master 2023-11-08 11:12:26 +01:00
5 changed files with 12 additions and 2 deletions
Showing only changes of commit 5f43fd17ba - Show all commits

View file

@ -8,6 +8,7 @@ RUN set -e; \
cargo new --lib lib/nexusmods; \
cargo new --lib lib/sdk; \
cargo new --lib lib/serde_sjson; \
cargo new --lib lib/ansi-parser
COPY Cargo.toml Cargo.lock /src/dtmt/
COPY crates/dtmt/Cargo.toml /src/dtmt/crates/dtmt/
@ -16,6 +17,7 @@ COPY lib/dtmt-shared/Cargo.toml /src/dtmt/lib/dtmt-shared/
COPY lib/nexusmods/Cargo.toml /src/dtmt/lib/nexusmods/
COPY lib/sdk/Cargo.toml /src/dtmt/lib/sdk/
COPY lib/serde_sjson/Cargo.toml /src/dtmt/lib/serde_sjson/
COPY lib/ansi-parser/Cargo.toml /src/dtmt/lib/ansi-parser/
# Crates with build scripts cannot be split that way, but they shouldn't change too often
COPY lib/luajit2-sys /src/dtmt/lib/luajit2-sys

View file

@ -8,6 +8,7 @@ RUN set -e; \
cargo new --lib lib/nexusmods; \
cargo new --lib lib/sdk; \
cargo new --lib lib/serde_sjson; \
cargo new --lib lib/ansi-parser
COPY Cargo.toml Cargo.lock /src/dtmt/
COPY crates/dtmt/Cargo.toml /src/dtmt/crates/dtmt/
@ -16,6 +17,7 @@ COPY lib/dtmt-shared/Cargo.toml /src/dtmt/lib/dtmt-shared/
COPY lib/nexusmods/Cargo.toml /src/dtmt/lib/nexusmods/
COPY lib/sdk/Cargo.toml /src/dtmt/lib/sdk/
COPY lib/serde_sjson/Cargo.toml /src/dtmt/lib/serde_sjson/
COPY lib/ansi-parser/Cargo.toml /src/dtmt/lib/ansi-parser/
# Crates with build scripts cannot be split that way, but they shouldn't change too often
COPY lib/luajit2-sys /src/dtmt/lib/luajit2-sys

3
.gitmodules vendored
View file

@ -9,4 +9,5 @@
url = https://github.com/sclu1034/color-eyre.git
[submodule "lib/ansi-parser"]
path = lib/ansi-parser
url = git@gitlab.com:lschwiderski/ansi-parser.git
url = https://gitlab.com/lschwiderski/ansi-parser.git
branch = "issue/outdated-nom"

View file

@ -8,9 +8,14 @@ members = [
"lib/sdk",
"lib/serde_sjson",
]
exclude = [
"lib/color-eyre",
"lib/ansi-parser",
]
[patch.crates-io]
color-eyre = { path = "lib/color-eyre" }
ansi-parser = { path = "lib/ansi-parser" }
[profile.dev.package.backtrace]
opt-level = 3

@ -1 +1 @@
Subproject commit 28001c31975ecaefd0133e952dd6bb6386f6c701
Subproject commit 27beb4bc1ffd2865a432e13f0588b5351ff419bf