SeanOMik
/
lyra-engine
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

scripting: add elua as a git submodule, remove mlua from the cargo.toml

This commit is contained in:
SeanOMik 2024-02-14 20:33:07 -05:00
parent 82c13a7dd2
commit f2f8248de7
Signed by: SeanOMik
GPG Key ID: FEC9E2FC15235964
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "lyra-scripting/elua"]
path = lyra-scripting/elua
url = git@git.seanomik.net:SeanOMik/elua.git

37
Cargo.lock generated
View File

@ -432,16 +432,6 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "bstr"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
dependencies = [
"memchr",
"serde",
]
[[package]] [[package]]
name = "bumpalo" name = "bumpalo"
version = "3.14.0" version = "3.14.0"
@ -742,6 +732,14 @@ version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elua"
version = "0.1.0"
dependencies = [
"mlua-sys",
"thiserror",
]
[[package]] [[package]]
name = "equivalent" name = "equivalent"
version = "1.0.1" version = "1.0.1"
@ -1608,13 +1606,13 @@ name = "lyra-scripting"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"elua",
"itertools 0.12.0", "itertools 0.12.0",
"lyra-ecs", "lyra-ecs",
"lyra-game", "lyra-game",
"lyra-reflect", "lyra-reflect",
"lyra-resource", "lyra-resource",
"lyra-scripting-derive", "lyra-scripting-derive",
"mlua",
"thiserror", "thiserror",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -1713,24 +1711,11 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "mlua"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c81f8ac20188feb5461a73eabb22a34dd09d6d58513535eb587e46bff6ba250"
dependencies = [
"bstr",
"mlua-sys",
"num-traits",
"once_cell",
"rustc-hash",
]
[[package]] [[package]]
name = "mlua-sys" name = "mlua-sys"
version = "0.4.0" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc29228347d6bdc9e613dc95c69df2817f755434ee0f7f3b27b57755fe238b7f" checksum = "2847b42764435201d8cbee1f517edb79c4cca4181877b90047587c89e1b7bce4"
dependencies = [ dependencies = [
"cc", "cc",
"cfg-if", "cfg-if",

5
lyra-scripting/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
[features] [features]
default = ["lua"] default = ["lua"]
lua = ["dep:mlua"] lua = ["dep:elua"]
[dependencies] [dependencies]
lyra-scripting-derive = { path = "lyra-scripting-derive" } lyra-scripting-derive = { path = "lyra-scripting-derive" }
@ -20,7 +20,8 @@ anyhow = "1.0.77"
tracing = "0.1.37" tracing = "0.1.37"
# enabled with lua feature # enabled with lua feature
mlua = { version = "0.9.2", features = ["lua54"], optional = true } # luajit maybe? #mlua = { version = "0.9.2", features = ["lua54"], optional = true } # luajit maybe?
elua = { path = "./elua", optional = true }
itertools = "0.12.0" itertools = "0.12.0"

1
lyra-scripting/elua Submodule

@ -0,0 +1 @@
Subproject commit 5694d395abbbce340eda195c99104db3e9c9435a