jyapayne/opengl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from barcharcraz/master

Browse source 
fixed dylib paths on OSX and changed the type of GLHandle from int to GL...
This commit is contained in:
Andreas Rumpf 2014-03-21 07:06:57 +01:00
commit 937331c898
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/opengl.nim
View file

@ -25,9 +25,11 @@ when defined(windows):
ogldll* = "OpenGL32.dll" ogldll* = "OpenGL32.dll"
gludll* = "GLU32.dll" gludll* = "GLU32.dll"
elif defined(macosx): elif defined(macosx):
#macosx has this notion of a framework, thus the path to the openGL dylib files
#is absolute
const const
ogldll* = "libGL.dylib" ogldll* = "/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib"
gludll* = "libGLU.dylib" gludll* = "/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGLU.dylib"
else: else:
const const
ogldll* = "libGL.so.1" ogldll* = "libGL.so.1"
@ -533,7 +535,7 @@ type
GLsizeiptr* = GLsizei # GL_ARB_vertex_buffer_object GLsizeiptr* = GLsizei # GL_ARB_vertex_buffer_object
GLintptrARB* = GLint GLintptrARB* = GLint
GLsizeiptrARB* = GLsizei # GL_VERSION_2_0 GLsizeiptrARB* = GLsizei # GL_VERSION_2_0
GLHandle* = int GLHandle* = GLuint
PGLchar* = cstring PGLchar* = cstring
PPGLchar* = ptr PGLChar # GL_EXT_timer_query PPGLchar* = ptr PGLChar # GL_EXT_timer_query
GLint64EXT* = Int64 GLint64EXT* = Int64