diff --git a/bin/Debug-x64/GLFW/GLFW.lib b/bin/Debug-x64/GLFW/GLFW.lib index f93fc08b..0dba86ff 100644 Binary files a/bin/Debug-x64/GLFW/GLFW.lib and b/bin/Debug-x64/GLFW/GLFW.lib differ diff --git a/bin/Debug-x64/GLFW/GLFW.pdb b/bin/Debug-x64/GLFW/GLFW.pdb index eeaf7956..b287be41 100644 Binary files a/bin/Debug-x64/GLFW/GLFW.pdb and b/bin/Debug-x64/GLFW/GLFW.pdb differ diff --git a/obj/Debug-x64/GLFW/GLFW.log b/obj/Debug-x64/GLFW/GLFW.log index 9931f440..fc800fa4 100644 --- a/obj/Debug-x64/GLFW/GLFW.log +++ b/obj/Debug-x64/GLFW/GLFW.log @@ -1,4 +1,6 @@ - context.c +cl : command line warning D9002: ignoring unknown option '-std=c11' +cl : command line warning D9002: ignoring unknown option '-lgdi32' + context.c egl_context.c init.c input.c diff --git a/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog b/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog index c1a57692..7639b6b3 100644 Binary files a/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog and b/obj/Debug-x64/GLFW/GLFW.tlog/CL.command.1.tlog differ diff --git a/obj/Debug-x64/GLFW/context.obj b/obj/Debug-x64/GLFW/context.obj index 3b7f7ef4..2cd754ba 100644 Binary files a/obj/Debug-x64/GLFW/context.obj and b/obj/Debug-x64/GLFW/context.obj differ diff --git a/obj/Debug-x64/GLFW/egl_context.obj b/obj/Debug-x64/GLFW/egl_context.obj index 8f831b49..72df1be9 100644 Binary files a/obj/Debug-x64/GLFW/egl_context.obj and b/obj/Debug-x64/GLFW/egl_context.obj differ diff --git a/obj/Debug-x64/GLFW/init.obj b/obj/Debug-x64/GLFW/init.obj index effaa1b1..fcebe0d3 100644 Binary files a/obj/Debug-x64/GLFW/init.obj and b/obj/Debug-x64/GLFW/init.obj differ diff --git a/obj/Debug-x64/GLFW/monitor.obj b/obj/Debug-x64/GLFW/monitor.obj index 8b1defd9..e279dbf5 100644 Binary files a/obj/Debug-x64/GLFW/monitor.obj and b/obj/Debug-x64/GLFW/monitor.obj differ diff --git a/obj/Debug-x64/GLFW/osmesa_context.obj b/obj/Debug-x64/GLFW/osmesa_context.obj index 587c2057..bc47d05d 100644 Binary files a/obj/Debug-x64/GLFW/osmesa_context.obj and b/obj/Debug-x64/GLFW/osmesa_context.obj differ diff --git a/obj/Debug-x64/GLFW/vulkan.obj b/obj/Debug-x64/GLFW/vulkan.obj index 0e39cfca..c4daccbe 100644 Binary files a/obj/Debug-x64/GLFW/vulkan.obj and b/obj/Debug-x64/GLFW/vulkan.obj differ diff --git a/obj/Debug-x64/GLFW/wgl_context.obj b/obj/Debug-x64/GLFW/wgl_context.obj index 8316e3fe..d3483e5f 100644 Binary files a/obj/Debug-x64/GLFW/wgl_context.obj and b/obj/Debug-x64/GLFW/wgl_context.obj differ diff --git a/obj/Debug-x64/GLFW/win32_init.obj b/obj/Debug-x64/GLFW/win32_init.obj index 2ad8a6b1..75b0c311 100644 Binary files a/obj/Debug-x64/GLFW/win32_init.obj and b/obj/Debug-x64/GLFW/win32_init.obj differ diff --git a/obj/Debug-x64/GLFW/win32_joystick.obj b/obj/Debug-x64/GLFW/win32_joystick.obj index 8c5db624..6b81e70d 100644 Binary files a/obj/Debug-x64/GLFW/win32_joystick.obj and b/obj/Debug-x64/GLFW/win32_joystick.obj differ diff --git a/obj/Debug-x64/GLFW/win32_monitor.obj b/obj/Debug-x64/GLFW/win32_monitor.obj index f186c726..42f62c76 100644 Binary files a/obj/Debug-x64/GLFW/win32_monitor.obj and b/obj/Debug-x64/GLFW/win32_monitor.obj differ diff --git a/obj/Debug-x64/GLFW/win32_thread.obj b/obj/Debug-x64/GLFW/win32_thread.obj index 8c00350c..9931b170 100644 Binary files a/obj/Debug-x64/GLFW/win32_thread.obj and b/obj/Debug-x64/GLFW/win32_thread.obj differ diff --git a/obj/Debug-x64/GLFW/win32_time.obj b/obj/Debug-x64/GLFW/win32_time.obj index b18d5595..cc11e7a6 100644 Binary files a/obj/Debug-x64/GLFW/win32_time.obj and b/obj/Debug-x64/GLFW/win32_time.obj differ diff --git a/obj/Debug-x64/GLFW/win32_window.obj b/obj/Debug-x64/GLFW/win32_window.obj index 7319cad7..1e0331bb 100644 Binary files a/obj/Debug-x64/GLFW/win32_window.obj and b/obj/Debug-x64/GLFW/win32_window.obj differ diff --git a/obj/Debug-x64/GLFW/window.obj b/obj/Debug-x64/GLFW/window.obj index aa282c59..5c206fa8 100644 Binary files a/obj/Debug-x64/GLFW/window.obj and b/obj/Debug-x64/GLFW/window.obj differ diff --git a/premake5.lua b/premake5.lua index 944f21b2..9b43c206 100644 --- a/premake5.lua +++ b/premake5.lua @@ -25,15 +25,16 @@ project "GLFW" "src/window.c", } - filter "system:windows" + filter "system:windows" + buildoptions { "-std=c11", "-lgdi32"} systemversion "latest" staticruntime "On" files { "src/win32_init.c", - "src/win32_joystick.c", - "src/win32_module.c", + "src/win32_joystick.c", + "src/win32_module.c", --this was originally missing "src/win32_monitor.c", "src/win32_time.c", "src/win32_thread.c", @@ -43,7 +44,7 @@ project "GLFW" "src/osmesa_context.c" } - defines + defines { "_GLFW_WIN32", "_CRT_SECURE_NO_WARNINGS"