Merge pull request #1574 from erwincoumans/master

fix glx include

build3/findOpenGLGlewGlut.lua

@@ -63,13 +63,22 @@
 
 		if os.is("Linux") then
 			configuration{"Linux"}
-				print("Using glad and dynamic loading of glx functions")
+				if  _OPTIONS["enable_system_glx"] then --# and (os.isdir("/usr/include") and os.isfile("/usr/include/GL/glx.h")) then
-			 	defines { "GLEW_STATIC","GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}
+                                	links{"X11","pthread"}
+					print("Using system GL/glx.h")
+                        	else
+					print("Using glad_glx")
+				 	defines { "GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1"}	
+				 	files { 
+					projectRootDir .. "examples/ThirdPartyLibs/glad/glad_glx.c"}
+				end
+
+				print("Using glad and dynamic loading of GL functions")
+			 	defines { "GLEW_STATIC"}
                         	includedirs {
                                         projectRootDir .. "examples/ThirdPartyLibs/glad"
                         	}
-                        	files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c",
+                        	files { projectRootDir .. "examples/ThirdPartyLibs/glad/glad.c"}
-					projectRootDir .. "examples/ThirdPartyLibs/glad/glad_glx.c"}
 				links {"dl"}
 
 		end

build3/premake4.lua

@@ -28,6 +28,12 @@
 		description = "Enable iOS target (requires xcode4)"
 	}
 
+	newoption
+	{
+		trigger = "enable_system_glx",
+		description = "Try to link against system glx instead of using glad_glx (default)"
+	}
+
 	newoption
 	{
 		trigger = "enable_system_opengl",

examples/OpenGLWindow/X11OpenGLWindow.cpp

@@ -15,7 +15,7 @@
 #ifdef GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 #include "glad/glad_glx.h"
 #else
-#include "GL/glx.h"
+#include <GL/glx.h>
 #endif // GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 #include <assert.h>