mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-14 15:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ArenaBug

Browse Source
This commit is contained in:
alektron
2025-01-15 18:00:29 +01:00
parent a0c20023fc e55b652916
commit 32d747cf8b
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.cpp
View File

@@ -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");
}
}
}
}

1
vendor/glfw/bindings/bindings.odin vendored
View File

@@ -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) ---

4
vendor/glfw/wrapper.odin vendored
View File

@@ -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