summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bridle <ben@derelict.engineering>2024-10-31 12:09:56 +1300
committerBen Bridle <ben@derelict.engineering>2024-10-31 12:10:01 +1300
commit82d70d1458efa3f566a1e774da98734ff5ec939a (patch)
treeb4da9e75252be4d770dda647bda7e33f60409701
parent8efe2561a99660147871a688bc02e4bb4c6cde60 (diff)
downloadbedrock-pc-82d70d1458efa3f566a1e774da98734ff5ec939a.zip
Fix source code merge order
This commit updates bedrock-asm to v4.0.3, which fixes an issue where the root source unit of a project could sometimes be merged after library code, preventing the program from running correctly.
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml2
2 files changed, 3 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 69e6fe4..baa3aea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,8 +77,8 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bedrock-asm"
-version = "4.0.2"
-source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.2#398904776672a8e2143cca8b8953b15e37ff2c53"
+version = "4.0.3"
+source = "git+git://benbridle.com/bedrock_asm?tag=v4.0.3#65d409e389d437d506a841ff5eb0a2a5d977a7d5"
dependencies = [
"vagabond",
"xflags",
diff --git a/Cargo.toml b/Cargo.toml
index d69da8b..f0db924 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
description = "Emulator for running Bedrock programs"
[dependencies]
-bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.2" }
+bedrock-asm = { git = "git://benbridle.com/bedrock_asm", tag = "v4.0.3" }
bedrock-core = { git = "git://benbridle.com/bedrock_core", tag = "v5.0.0" }
phosphor = { git = "git://benbridle.com/phosphor", tag = "v3.1.0" }
geometry = { git = "git://benbridle.com/geometry", tag = "v1.0.0" }