From 9aa77262ddb007b3d21ec95eeb31d4465fead1a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Sat, 25 May 2019 17:13:55 -0700 Subject: [PATCH] OSX: Fixed GLFW3 linkage. --- scripts/genie.lua | 5 ++++- scripts/texturev.lua | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index 5876caa5a..e33dbded0 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -192,7 +192,6 @@ function exampleProjectDefaults() if _OPTIONS["with-glfw"] then defines { "ENTRY_CONFIG_USE_GLFW=1" } - links { "glfw3" } configuration { "linux or freebsd" } if _OPTIONS["with-wayland"] then @@ -209,7 +208,11 @@ function exampleProjectDefaults() } end + configuration { "not osx" } + links { "glfw3" } + configuration { "osx" } + links { "glfw" } linkoptions { "-framework CoreVideo", "-framework IOKit", diff --git a/scripts/texturev.lua b/scripts/texturev.lua index f6e93d8ba..4c35afe53 100644 --- a/scripts/texturev.lua +++ b/scripts/texturev.lua @@ -41,7 +41,6 @@ project ("texturev") if _OPTIONS["with-glfw"] then defines { "ENTRY_CONFIG_USE_GLFW=1" } - links { "glfw3" } configuration { "linux or freebsd" } links { @@ -52,7 +51,11 @@ project ("texturev") "Xcursor", } + configuration { "not osx" } + links { "glfw3" } + configuration { "osx" } + links { "glfw" } linkoptions { "-framework CoreVideo", "-framework IOKit",