Merge pull request #74 from elmindreda/master
Replaced hardcoded GLFW link flags with pkgconfig
This commit is contained in:
commit
847f0f591d
18
premake4.lua
18
premake4.lua
@ -30,7 +30,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3", "GLEW" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
defines { "NANOVG_GLEW" }
|
defines { "NANOVG_GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
@ -58,7 +59,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3", "GLEW" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
defines { "NANOVG_GLEW" }
|
defines { "NANOVG_GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
@ -87,7 +89,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3", "GLEW" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
defines { "NANOVG_GLEW" }
|
defines { "NANOVG_GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
@ -116,7 +119,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3", "GLEW" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
defines { "NANOVG_GLEW" }
|
defines { "NANOVG_GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
@ -144,7 +148,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
links { "glfw3", "gdi32", "winmm", "user32", "GLEW", "glu32","opengl32" }
|
links { "glfw3", "gdi32", "winmm", "user32", "GLEW", "glu32","opengl32" }
|
||||||
@ -171,7 +176,8 @@ solution "nanovg"
|
|||||||
links { "nanovg" }
|
links { "nanovg" }
|
||||||
|
|
||||||
configuration { "linux" }
|
configuration { "linux" }
|
||||||
links { "X11","Xrandr", "rt", "GL", "GLU", "pthread", "m", "glfw3" }
|
linkoptions { "`pkg-config --libs glfw3`" }
|
||||||
|
links { "GL", "GLU", "m", "GLEW" }
|
||||||
|
|
||||||
configuration { "windows" }
|
configuration { "windows" }
|
||||||
links { "glfw3", "gdi32", "winmm", "user32", "GLEW", "glu32","opengl32" }
|
links { "glfw3", "gdi32", "winmm", "user32", "GLEW", "glu32","opengl32" }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user