Browse Source

OSX: Fixed GLFW3 linkage.

Бранимир Караџић 6 years ago
parent
commit
9aa77262dd
2 changed files with 8 additions and 2 deletions
  1. 4 1
      scripts/genie.lua
  2. 4 1
      scripts/texturev.lua

+ 4 - 1
scripts/genie.lua

@@ -192,7 +192,6 @@ function exampleProjectDefaults()
 
 
 	if _OPTIONS["with-glfw"] then
 	if _OPTIONS["with-glfw"] then
 		defines { "ENTRY_CONFIG_USE_GLFW=1" }
 		defines { "ENTRY_CONFIG_USE_GLFW=1" }
-		links   { "glfw3" }
 
 
 		configuration { "linux or freebsd" }
 		configuration { "linux or freebsd" }
 			if _OPTIONS["with-wayland"] then
 			if _OPTIONS["with-wayland"] then
@@ -209,7 +208,11 @@ function exampleProjectDefaults()
 				}
 				}
 			end
 			end
 
 
+		configuration { "not osx" }
+			links { "glfw3" }
+
 		configuration { "osx" }
 		configuration { "osx" }
+			links { "glfw" }
 			linkoptions {
 			linkoptions {
 				"-framework CoreVideo",
 				"-framework CoreVideo",
 				"-framework IOKit",
 				"-framework IOKit",

+ 4 - 1
scripts/texturev.lua

@@ -41,7 +41,6 @@ project ("texturev")
 
 
 	if _OPTIONS["with-glfw"] then
 	if _OPTIONS["with-glfw"] then
 		defines { "ENTRY_CONFIG_USE_GLFW=1" }
 		defines { "ENTRY_CONFIG_USE_GLFW=1" }
-		links   { "glfw3" }
 
 
 		configuration { "linux or freebsd" }
 		configuration { "linux or freebsd" }
 			links {
 			links {
@@ -52,7 +51,11 @@ project ("texturev")
 				"Xcursor",
 				"Xcursor",
 			}
 			}
 
 
+		configuration { "not osx" }
+			links { "glfw3" }
+
 		configuration { "osx" }
 		configuration { "osx" }
+			links { "glfw" }
 			linkoptions {
 			linkoptions {
 				"-framework CoreVideo",
 				"-framework CoreVideo",
 				"-framework IOKit",
 				"-framework IOKit",