Browse Source

Revert "OSX: Fixed GLFW3 linkage."

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

+ 1 - 4
scripts/genie.lua

@@ -192,6 +192,7 @@ 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
@@ -208,11 +209,7 @@ 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",

+ 1 - 4
scripts/texturev.lua

@@ -41,6 +41,7 @@ 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 {
@@ -51,11 +52,7 @@ 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",