Skip to content

Commit

Permalink
Fix glfw linker errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Foereaper committed Jul 30, 2024
1 parent 0b62075 commit d67d3f8
Showing 1 changed file with 22 additions and 14 deletions.
36 changes: 22 additions & 14 deletions Dependencies/glfw/glfw.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,25 @@ Solution.Util.CreateStaticLib(dep.Name, Solution.Projects.Current.BinDir, dep.De
includeDir .. "/GLFW/glfw3.h",
includeDir .. "/GLFW/glfw3native.h",


sourceDir .. "/internal.h",
sourceDir .. "/platform.h",
sourceDir .. "/mappings.h",
sourceDir .. "/context.c",
sourceDir .. "/init.c",
sourceDir .. "/input.c",
sourceDir .. "/monitor.c",
sourceDir .. "/platform.c",
sourceDir .. "/vulkan.c",
sourceDir .. "/window.c",
sourceDir .. "/platform.h"
sourceDir .. "/egl_context.c",
sourceDir .. "/osmesa_context.c",
sourceDir .. "/null_platform.h",
sourceDir .. "/null_joystick.h",
sourceDir .. "/null_init.c",

sourceDir .. "/null_monitor.c",
sourceDir .. "/null_window.c",
sourceDir .. "/null_joystick.c",
}
Solution.Util.SetFiles(files)
Solution.Util.SetIncludes(dep.Path)
Expand All @@ -30,13 +41,11 @@ Solution.Util.CreateStaticLib(dep.Name, Solution.Projects.Current.BinDir, dep.De
Solution.Util.SetFilter("platforms:Win64", function()
local files =
{
sourceDir .. "/win32_platform.h",
sourceDir .. "/win32_joystick.h",
sourceDir .. "/wgl_context.h",
sourceDir .. "/egl_context.h",
sourceDir .. "/osmesa_context.h",
sourceDir .. "/win32_thread.h",
sourceDir .. "/win32_time.h",

sourceDir .. "/win32_init.c",
sourceDir .. "/win32_module.c",
sourceDir .. "/win32_joystick.c",
sourceDir .. "/win32_monitor.c",
sourceDir .. "/win32_time.c",
Expand All @@ -54,17 +63,16 @@ Solution.Util.CreateStaticLib(dep.Name, Solution.Projects.Current.BinDir, dep.De
Solution.Util.SetFilter("system:linux", function()
local files =
{
sourceDir .. "/x11_platform.h",
sourceDir .. "/linux_joystick.h",
sourceDir .. "/egl_context.h",

sourceDir .. "/x11_init.c",
sourceDir .. "/linux_joystick.c",
sourceDir .. "/x11_monitor.c",
sourceDir .. "/x11_window.c",
sourceDir .. "/xkb_unicode.c",
sourceDir .. "/posix_time.c",
sourceDir .. "/posix_thread.c",
sourceDir .. "/x11_window.c",
sourceDir .. "/egl_context.c"
sourceDir .. "/glx_context.c",
sourceDir .. "/egl_context.c",
sourceDir .. "/osmesa_context.c",
sourceDir .. "/linux_joystick.c"
}

Solution.Util.SetFiles(files)
Expand Down

0 comments on commit d67d3f8

Please sign in to comment.