diff options
| author | alektron <alektron1@gmail.com> | 2025-01-15 18:00:29 +0100 |
|---|---|---|
| committer | alektron <alektron1@gmail.com> | 2025-01-15 18:00:29 +0100 |
| commit | 32d747cf8bc61db63d1137585e06f075ff333fe1 (patch) | |
| tree | 9a1670afebc4966cb17d2679f7585f210f3fd28a | |
| parent | a0c20023fc87e0cbd2a2316a2eb993edf67815cf (diff) | |
| parent | e55b65291685c8a1fc3d70252a73f01c7c6f253c (diff) | |
Merge branch 'master' into ArenaBug
| -rw-r--r-- | src/main.cpp | 5 | ||||
| -rw-r--r-- | vendor/glfw/bindings/bindings.odin | 1 | ||||
| -rw-r--r-- | vendor/glfw/wrapper.odin | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 41c7170f6..1de5d987b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1801,7 +1801,10 @@ gb_internal void check_defines(BuildContext *bc, Checker *c) { if (!found) { ERROR_BLOCK(); warning(nullptr, "given -define:%.*s is unused in the project", LIT(name)); - error_line("\tSuggestion: use the -show-defineables flag for an overview of the possible defines\n"); + + if (!global_ignore_warnings()) { + error_line("\tSuggestion: use the -show-defineables flag for an overview of the possible defines\n"); + } } } } diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index a4be006b0..e59239483 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -71,6 +71,7 @@ foreign glfw { GetPrimaryMonitor :: proc() -> MonitorHandle --- GetMonitors :: proc(count: ^c.int) -> [^]MonitorHandle --- GetMonitorPos :: proc(monitor: MonitorHandle, xpos, ypos: ^c.int) --- + GetMonitorWorkarea :: proc(monitor: MonitorHandle, xpos, ypos, width, height: ^c.int) --- GetMonitorPhysicalSize :: proc(monitor: MonitorHandle, widthMM, heightMM: ^c.int) --- GetMonitorContentScale :: proc(monitor: MonitorHandle, xscale, yscale: ^f32) --- diff --git a/vendor/glfw/wrapper.odin b/vendor/glfw/wrapper.odin index fa9329aa7..854dcdf9a 100644 --- a/vendor/glfw/wrapper.odin +++ b/vendor/glfw/wrapper.odin @@ -33,6 +33,10 @@ GetMonitorPos :: proc "c" (monitor: MonitorHandle) -> (xpos, ypos: c.int) { glfw.GetMonitorPos(monitor, &xpos, &ypos) return } +GetMonitorWorkarea :: proc "c" (monitor: MonitorHandle) -> (xpos, ypos, width, height: c.int) { + glfw.GetMonitorWorkarea(monitor, &xpos, &ypos, &width, &height) + return +} GetMonitorPhysicalSize :: proc "c" (monitor: MonitorHandle) -> (widthMM, heightMM: c.int) { glfw.GetMonitorPhysicalSize(monitor, &widthMM, &heightMM) return |