From 9302bb4ff8272f5aada8efe4b2f2cac5098fb2da Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Thu, 2 Jul 2026 17:32:24 +0200
Subject: build(engine): use upstream dear-imgui-rs commit with libstdc++
 linking fix

---
 Cargo.lock        | 15 +++++++++------
 engine/Cargo.toml |  6 ++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 721e3fb..23c697c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -517,13 +517,16 @@ checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f"
 
 [[package]]
 name = "dear-imgui-build-support"
-version = "0.14.0"
-source = "git+https://github.com/HampusMat/dear-imgui-rs?branch=windows-always-static-libstdc%2B%2B#02e1a976d94f4a8c95447c0bfbe21f90b6c07c22"
+version = "0.15.1"
+source = "git+https://github.com/Latias94/dear-imgui-rs?rev=cd2425b699e746852757e9290257bbf09129cfa7#cd2425b699e746852757e9290257bbf09129cfa7"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "dear-imgui-rs"
-version = "0.14.0"
-source = "git+https://github.com/HampusMat/dear-imgui-rs?branch=windows-always-static-libstdc%2B%2B#02e1a976d94f4a8c95447c0bfbe21f90b6c07c22"
+version = "0.15.1"
+source = "git+https://github.com/Latias94/dear-imgui-rs?rev=cd2425b699e746852757e9290257bbf09129cfa7#cd2425b699e746852757e9290257bbf09129cfa7"
 dependencies = [
  "bitflags 2.11.1",
  "cfg-if",
@@ -537,8 +540,8 @@ dependencies = [
 
 [[package]]
 name = "dear-imgui-sys"
-version = "0.14.0"
-source = "git+https://github.com/HampusMat/dear-imgui-rs?branch=windows-always-static-libstdc%2B%2B#02e1a976d94f4a8c95447c0bfbe21f90b6c07c22"
+version = "0.15.1"
+source = "git+https://github.com/Latias94/dear-imgui-rs?rev=cd2425b699e746852757e9290257bbf09129cfa7#cd2425b699e746852757e9290257bbf09129cfa7"
 dependencies = [
  "cc",
  "cfg-if",
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index f2efec4..67f59d8 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -46,8 +46,10 @@ default-features = false # The "fallback" feature should not be enabled
 features = ["require-cas"]
 
 [dependencies.dear-imgui-rs]
-git = "https://github.com/HampusMat/dear-imgui-rs"
-branch = "windows-always-static-libstdc++"
+git = "https://github.com/Latias94/dear-imgui-rs"
+# This commit has a fix for linking with libstdc++ on non-msvc Windows targets. When a
+# release with this fix is available, it should be used instead
+rev = "cd2425b699e746852757e9290257bbf09129cfa7"
 
 [build-dependencies]
 build-rs = "0.3.4"
-- 
cgit v1.2.3-18-g5258