Improved linux compatibility

Author: ColonelThirtyTwo

gen/cdef.py

@@ -1,9 +1,8 @@
 
 import re
 import sys
-from collections import OrderedDict
 
-defines = OrderedDict()
+defines = {}
 cdefs = []
 
 location_re = re.compile(r'^# \d+ "([^"]*)"')
@@ -63,7 +62,10 @@
 		# Otherwise just include it in the cdef
 		elif in_gl:
 			# Windows likes to add __stdcall__ to everything, but it isn't needed and is actually harmful when using under linux.
-			cdefs.append(line.replace(r'__attribute__((__stdcall__)) ', ''))
+			line = line.replace('__attribute__((__stdcall__)) ', '')
+			# While linux likes to add __attribute__((visibility("default"))) 
+			line = line.replace('__attribute__((visibility("default"))) ', '')
+			cdefs.append(line.replace('__attribute__((__stdcall__)) ', ''))
 
 	# Output the file
 	print("--[[ BEGIN AUTOGENERATED SEGMENT ]]")
@@ -72,7 +74,7 @@
 		print("\t", line, sep="")
 	print("\t]]; glc = {")
 
-	for k in defines.keys():
+	for k in sorted(defines.keys()):
 		print("\t%s = %s," % ("['"+k+"']", defines[k]))
 
 	print("} end")

glfw_base.lua

@@ -10,11 +10,12 @@ local gl, glu, glfw
 if ffi.os == "Windows" then
 	gl = ffi.load("opengl32")
 	glu = ffi.load("glu32")
+	glfw = ffi.load("glfw3")
 else
 	gl = ffi.load("GL")
 	glu = ffi.load("GLU")
+	glfw = ffi.load("glfw.so.3")
 end
-glfw = ffi.load("glfw3")
 
 Lib.gl = gl
 Lib.glc = glc

readme.md

@@ -10,7 +10,7 @@ Building
 --------
 
 LuaJIT-GLFW builds bindings from the systems OpenGL and GLFW headers, as well as an included `glext.h` file.
-To build the bindings, you need to have `gcc` as well as headers for OpenGL and GLFW installed, though the resulting
+To build the bindings, you need to have `gcc`, headers for OpenGL and GLFW 3, and Python 3 installed, though the resulting
 file should be cross-platform compatible.
 
 To build, just run `build.sh` in the repository directory. This will create a `glfw.lua` file, which is the only file
@@ -30,7 +30,7 @@ LuaJIT-GLFW loads the following libraries:
 * `glfw.gl`: OpenGL
 * `glfw.glu`: GLU
 * `glfw.glfw`: GLFW
-* `glfw.glext`: A table that, when indexed, loads the specified extension function.
+* `glfw.glext`: A table that, when indexed, loads and returns the specified extension function. Ex. `glext.glMyExtFuncARB(p1, p2)`
 * `glfw.glc`: `#define`d values for OpenGL and GLFW (this must be a Lua table instead of `static const` values, because OpenGL uses `longs` in a couple of places)
 
-Additionally, LuaJIT-GLFW wraps GLFW functions and structs for convenience. See `glfw_base.lua`
+Additionally, LuaJIT-GLFW wraps GLFW functions and sets metatypes for GLFW structs for convenience. See `glfw_base.lua`