diff -Nru a7xpg-0.11.dfsg1/debian/a7xpg.manpages a7xpg-0.11.dfsg1/debian/a7xpg.manpages --- a7xpg-0.11.dfsg1/debian/a7xpg.manpages 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/a7xpg.manpages 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1 @@ +debian/a7xpg.6 diff -Nru a7xpg-0.11.dfsg1/debian/changelog a7xpg-0.11.dfsg1/debian/changelog --- a7xpg-0.11.dfsg1/debian/changelog 2012-01-05 17:13:51.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/changelog 2013-06-30 09:51:39.000000000 +0000 @@ -1,3 +1,19 @@ +a7xpg (0.11.dfsg1-8) unstable; urgency=low + + [ Barry deFreese ] + * Patch to build with gdc v2. (Closes: #707263) + * Bump Standards Version to 3.9.4. + + [ Ansgar Burchardt ] + * debian/control: Remove DM-Upload-Allowed. + + [ Peter De Wachter ] + * Added build-depends on libphobos-dev + * Switch dh-style minimal rules file + * Mark -data package as Multi-Arch: foreign + + -- Peter De Wachter Sun, 30 Jun 2013 13:09:07 +0200 + a7xpg (0.11.dfsg1-7) unstable; urgency=low * Build using gdc-v1, instead of gdc (v2). Closes: #653083, @@ -5,8 +21,10 @@ * Update to standards to 3.9.2 * Provide build-indep and build-arch targets * Drop ^M in the debian Makefile + * B-Dep on gdc-v1 (>= 4.6.2-4~) to avoid FTBS due to broken gdmd-v1 + symlink - -- Vincent Fourmond Thu, 05 Jan 2012 18:13:29 +0100 + -- Vincent Fourmond Thu, 05 Jan 2012 19:45:17 +0100 a7xpg (0.11.dfsg1-6) unstable; urgency=low diff -Nru a7xpg-0.11.dfsg1/debian/compat a7xpg-0.11.dfsg1/debian/compat --- a7xpg-0.11.dfsg1/debian/compat 2007-08-25 20:35:41.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/compat 2013-06-30 09:51:39.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru a7xpg-0.11.dfsg1/debian/control a7xpg-0.11.dfsg1/debian/control --- a7xpg-0.11.dfsg1/debian/control 2012-01-05 17:07:55.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/control 2013-06-30 09:51:39.000000000 +0000 @@ -3,14 +3,14 @@ Priority: extra Maintainer: Debian Games Team Uploaders: Miriam Ruiz , Peter De Wachter , Vincent Fourmond -Build-Depends: debhelper (>= 5), gdc-v1, +Build-Depends: debhelper (>= 9), gdc (>= 4.8.1), libphobos-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libsdl1.2-dev, libsdl-mixer1.2-dev -Standards-Version: 3.9.2 +Build-Conflicts: libphobos-4.4-dev +Standards-Version: 3.9.4 Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/a7xpg_e.html -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/a7xpg/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/a7xpg/?op=log -DM-Upload-Allowed: yes +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/a7xpg/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/a7xpg/ Package: a7xpg Architecture: any @@ -25,6 +25,7 @@ Package: a7xpg-data Architecture: all +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: a7xpg Description: chase action game - game data diff -Nru a7xpg-0.11.dfsg1/debian/copyright a7xpg-0.11.dfsg1/debian/copyright --- a7xpg-0.11.dfsg1/debian/copyright 2007-08-25 22:09:47.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/copyright 2013-06-30 09:51:39.000000000 +0000 @@ -54,9 +54,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL'. +On Debian systems, the complete text of the GNU Lesser General Public +License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. -The Debian packaging is (C) 2007, Miriam Ruiz and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is Copyright(C) 2007, Miriam Ruiz +and is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. diff -Nru a7xpg-0.11.dfsg1/debian/patches/01_port_opengl_headers.diff a7xpg-0.11.dfsg1/debian/patches/01_port_opengl_headers.diff --- a7xpg-0.11.dfsg1/debian/patches/01_port_opengl_headers.diff 2007-08-29 18:47:04.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/01_port_opengl_headers.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,706 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:52:09 CEST 2007 pdewacht@gmail.com - * 01_port_opengl_headers -Index: a7xpg-0.11.dfsg1/import/opengl.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/opengl.d 2007-08-29 20:46:30.000000000 +0200 -+++ a7xpg-0.11.dfsg1/import/opengl.d 2007-08-29 20:46:43.000000000 +0200 -@@ -1,6 +1,4 @@ --import windows; -- --extern(Windows): -+extern(C): - - alias uint GLenum; - alias ubyte GLboolean; -@@ -1111,345 +1109,343 @@ - - /*************************************************************/ - --extern(Windows) void /*APIENTRY*/glAccum (GLenum op, GLfloat value); --extern(Windows) void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref); --extern(Windows) GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); --extern(Windows) void /*APIENTRY*/glArrayElement (GLint i); --extern(Windows) void /*APIENTRY*/glBegin (GLenum mode); --extern(Windows) void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); --extern(Windows) void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); --extern(Windows) void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); --extern(Windows) void /*APIENTRY*/glCallList (GLuint list); --extern(Windows) void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); --extern(Windows) void /*APIENTRY*/glClear (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); --extern(Windows) void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); --extern(Windows) void /*APIENTRY*/glClearDepth (GLclampd depth); --extern(Windows) void /*APIENTRY*/glClearIndex (GLfloat c); --extern(Windows) void /*APIENTRY*/glClearStencil (GLint s); --extern(Windows) void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); --extern(Windows) void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); --extern(Windows) void /*APIENTRY*/glColor3bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); --extern(Windows) void /*APIENTRY*/glColor3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); --extern(Windows) void /*APIENTRY*/glColor3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); --extern(Windows) void /*APIENTRY*/glColor3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); --extern(Windows) void /*APIENTRY*/glColor3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); --extern(Windows) void /*APIENTRY*/glColor3ubv (GLubyte *v); --extern(Windows) void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); --extern(Windows) void /*APIENTRY*/glColor3uiv (GLuint *v); --extern(Windows) void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); --extern(Windows) void /*APIENTRY*/glColor3usv (GLushort *v); --extern(Windows) void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); --extern(Windows) void /*APIENTRY*/glColor4bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); --extern(Windows) void /*APIENTRY*/glColor4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); --extern(Windows) void /*APIENTRY*/glColor4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); --extern(Windows) void /*APIENTRY*/glColor4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); --extern(Windows) void /*APIENTRY*/glColor4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); --extern(Windows) void /*APIENTRY*/glColor4ubv (GLubyte *v); --extern(Windows) void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); --extern(Windows) void /*APIENTRY*/glColor4uiv (GLuint *v); --extern(Windows) void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); --extern(Windows) void /*APIENTRY*/glColor4usv (GLushort *v); --extern(Windows) void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); --extern(Windows) void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); --extern(Windows) void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); --extern(Windows) void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); --extern(Windows) void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); --extern(Windows) void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); --extern(Windows) void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); --extern(Windows) void /*APIENTRY*/glCullFace (GLenum mode); --extern(Windows) void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); --extern(Windows) void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); --extern(Windows) void /*APIENTRY*/glDepthFunc (GLenum func); --extern(Windows) void /*APIENTRY*/glDepthMask (GLboolean flag); --extern(Windows) void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); --extern(Windows) void /*APIENTRY*/glDisable (GLenum cap); --extern(Windows) void /*APIENTRY*/glDisableClientState (GLenum array); --extern(Windows) void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); --extern(Windows) void /*APIENTRY*/glDrawBuffer (GLenum mode); --extern(Windows) void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); --extern(Windows) void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glEdgeFlag (GLboolean flag); --extern(Windows) void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); --extern(Windows) void /*APIENTRY*/glEnable (GLenum cap); --extern(Windows) void /*APIENTRY*/glEnableClientState (GLenum array); --extern(Windows) void /*APIENTRY*/glEnd (); --extern(Windows) void /*APIENTRY*/glEndList (); --extern(Windows) void /*APIENTRY*/glEvalCoord1d (GLdouble u); --extern(Windows) void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); --extern(Windows) void /*APIENTRY*/glEvalCoord1f (GLfloat u); --extern(Windows) void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); --extern(Windows) void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); --extern(Windows) void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); --extern(Windows) void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); --extern(Windows) void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); --extern(Windows) void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); --extern(Windows) void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); --extern(Windows) void /*APIENTRY*/glEvalPoint1 (GLint i); --extern(Windows) void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); --extern(Windows) void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); --extern(Windows) void /*APIENTRY*/glFinish (); --extern(Windows) void /*APIENTRY*/glFlush (); --extern(Windows) void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glFogi (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glFrontFace (GLenum mode); --extern(Windows) void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); --extern(Windows) GLuint /*APIENTRY*/glGenLists (GLsizei range); --extern(Windows) void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); --extern(Windows) void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); --extern(Windows) void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); --extern(Windows) void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); --extern(Windows) GLenum /*APIENTRY*/glGetError (); --extern(Windows) void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); --extern(Windows) void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); --extern(Windows) void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); --extern(Windows) void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); --extern(Windows) void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); --extern(Windows) void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); --extern(Windows) void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); --extern(Windows) void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); --extern(Windows) GLubyte * /*APIENTRY*/glGetString (GLenum name); --extern(Windows) void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); --extern(Windows) void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glHint (GLenum target, GLenum mode); --extern(Windows) void /*APIENTRY*/glIndexMask (GLuint mask); --extern(Windows) void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glIndexd (GLdouble c); --extern(Windows) void /*APIENTRY*/glIndexdv (GLdouble *c); --extern(Windows) void /*APIENTRY*/glIndexf (GLfloat c); --extern(Windows) void /*APIENTRY*/glIndexfv (GLfloat *c); --extern(Windows) void /*APIENTRY*/glIndexi (GLint c); --extern(Windows) void /*APIENTRY*/glIndexiv (GLint *c); --extern(Windows) void /*APIENTRY*/glIndexs (GLshort c); --extern(Windows) void /*APIENTRY*/glIndexsv (GLshort *c); --extern(Windows) void /*APIENTRY*/glIndexub (GLubyte c); --extern(Windows) void /*APIENTRY*/glIndexubv (GLubyte *c); --extern(Windows) void /*APIENTRY*/glInitNames (); --extern(Windows) void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); --extern(Windows) GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); --extern(Windows) GLboolean /*APIENTRY*/glIsList (GLuint list); --extern(Windows) GLboolean /*APIENTRY*/glIsTexture (GLuint texture); --extern(Windows) void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); --extern(Windows) void /*APIENTRY*/glLineWidth (GLfloat width); --extern(Windows) void /*APIENTRY*/glListBase (GLuint base); --extern(Windows) void /*APIENTRY*/glLoadIdentity (); --extern(Windows) void /*APIENTRY*/glLoadMatrixd (GLdouble *m); --extern(Windows) void /*APIENTRY*/glLoadMatrixf (GLfloat *m); --extern(Windows) void /*APIENTRY*/glLoadName (GLuint name); --extern(Windows) void /*APIENTRY*/glLogicOp (GLenum opcode); --extern(Windows) void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); --extern(Windows) void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); --extern(Windows) void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); --extern(Windows) void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); --extern(Windows) void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); --extern(Windows) void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); --extern(Windows) void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); --extern(Windows) void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); --extern(Windows) void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glMatrixMode (GLenum mode); --extern(Windows) void /*APIENTRY*/glMultMatrixd (GLdouble *m); --extern(Windows) void /*APIENTRY*/glMultMatrixf (GLfloat *m); --extern(Windows) void /*APIENTRY*/glNewList (GLuint list, GLenum mode); --extern(Windows) void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); --extern(Windows) void /*APIENTRY*/glNormal3bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); --extern(Windows) void /*APIENTRY*/glNormal3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); --extern(Windows) void /*APIENTRY*/glNormal3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); --extern(Windows) void /*APIENTRY*/glNormal3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); --extern(Windows) void /*APIENTRY*/glNormal3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); --extern(Windows) void /*APIENTRY*/glPassThrough (GLfloat token); --extern(Windows) void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); --extern(Windows) void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); --extern(Windows) void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); --extern(Windows) void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); --extern(Windows) void /*APIENTRY*/glPointSize (GLfloat size); --extern(Windows) void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); --extern(Windows) void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); --extern(Windows) void /*APIENTRY*/glPolygonStipple (GLubyte *mask); --extern(Windows) void /*APIENTRY*/glPopAttrib (); --extern(Windows) void /*APIENTRY*/glPopClientAttrib (); --extern(Windows) void /*APIENTRY*/glPopMatrix (); --extern(Windows) void /*APIENTRY*/glPopName (); --extern(Windows) void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); --extern(Windows) void /*APIENTRY*/glPushAttrib (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glPushMatrix (); --extern(Windows) void /*APIENTRY*/glPushName (GLuint name); --extern(Windows) void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); --extern(Windows) void /*APIENTRY*/glRasterPos2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); --extern(Windows) void /*APIENTRY*/glRasterPos2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); --extern(Windows) void /*APIENTRY*/glRasterPos2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); --extern(Windows) void /*APIENTRY*/glRasterPos2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glRasterPos3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glRasterPos3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); --extern(Windows) void /*APIENTRY*/glRasterPos3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); --extern(Windows) void /*APIENTRY*/glRasterPos3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); --extern(Windows) void /*APIENTRY*/glRasterPos4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); --extern(Windows) void /*APIENTRY*/glRasterPos4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); --extern(Windows) void /*APIENTRY*/glRasterPos4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); --extern(Windows) void /*APIENTRY*/glRasterPos4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glReadBuffer (GLenum mode); --extern(Windows) void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); --extern(Windows) void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); --extern(Windows) void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); --extern(Windows) void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); --extern(Windows) void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); --extern(Windows) void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); --extern(Windows) void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); --extern(Windows) void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); --extern(Windows) GLint /*APIENTRY*/glRenderMode (GLenum mode); --extern(Windows) void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); --extern(Windows) void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); --extern(Windows) void /*APIENTRY*/glShadeModel (GLenum mode); --extern(Windows) void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask); --extern(Windows) void /*APIENTRY*/glStencilMask (GLuint mask); --extern(Windows) void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); --extern(Windows) void /*APIENTRY*/glTexCoord1d (GLdouble s); --extern(Windows) void /*APIENTRY*/glTexCoord1dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord1f (GLfloat s); --extern(Windows) void /*APIENTRY*/glTexCoord1fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord1i (GLint s); --extern(Windows) void /*APIENTRY*/glTexCoord1iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord1s (GLshort s); --extern(Windows) void /*APIENTRY*/glTexCoord1sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); --extern(Windows) void /*APIENTRY*/glTexCoord2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); --extern(Windows) void /*APIENTRY*/glTexCoord2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); --extern(Windows) void /*APIENTRY*/glTexCoord2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); --extern(Windows) void /*APIENTRY*/glTexCoord2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); --extern(Windows) void /*APIENTRY*/glTexCoord3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); --extern(Windows) void /*APIENTRY*/glTexCoord3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); --extern(Windows) void /*APIENTRY*/glTexCoord3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); --extern(Windows) void /*APIENTRY*/glTexCoord3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); --extern(Windows) void /*APIENTRY*/glTexCoord4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); --extern(Windows) void /*APIENTRY*/glTexCoord4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); --extern(Windows) void /*APIENTRY*/glTexCoord4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); --extern(Windows) void /*APIENTRY*/glTexCoord4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); --extern(Windows) void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); --extern(Windows) void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); --extern(Windows) void /*APIENTRY*/glVertex2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); --extern(Windows) void /*APIENTRY*/glVertex2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex2i (GLint x, GLint y); --extern(Windows) void /*APIENTRY*/glVertex2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); --extern(Windows) void /*APIENTRY*/glVertex2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glVertex3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glVertex3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); --extern(Windows) void /*APIENTRY*/glVertex3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); --extern(Windows) void /*APIENTRY*/glVertex3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); --extern(Windows) void /*APIENTRY*/glVertex4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); --extern(Windows) void /*APIENTRY*/glVertex4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); --extern(Windows) void /*APIENTRY*/glVertex4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); --extern(Windows) void /*APIENTRY*/glVertex4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); -- -+void /*APIENTRY*/glAccum (GLenum op, GLfloat value); -+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_); -+GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); -+void /*APIENTRY*/glArrayElement (GLint i); -+void /*APIENTRY*/glBegin (GLenum mode); -+void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); -+void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); -+void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); -+void /*APIENTRY*/glCallList (GLuint list); -+void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); -+void /*APIENTRY*/glClear (GLbitfield mask); -+void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -+void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -+void /*APIENTRY*/glClearDepth (GLclampd depth); -+void /*APIENTRY*/glClearIndex (GLfloat c); -+void /*APIENTRY*/glClearStencil (GLint s); -+void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); -+void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); -+void /*APIENTRY*/glColor3bv (GLbyte *v); -+void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); -+void /*APIENTRY*/glColor3dv (GLdouble *v); -+void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); -+void /*APIENTRY*/glColor3fv (GLfloat *v); -+void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); -+void /*APIENTRY*/glColor3iv (GLint *v); -+void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); -+void /*APIENTRY*/glColor3sv (GLshort *v); -+void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); -+void /*APIENTRY*/glColor3ubv (GLubyte *v); -+void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); -+void /*APIENTRY*/glColor3uiv (GLuint *v); -+void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); -+void /*APIENTRY*/glColor3usv (GLushort *v); -+void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); -+void /*APIENTRY*/glColor4bv (GLbyte *v); -+void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); -+void /*APIENTRY*/glColor4dv (GLdouble *v); -+void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -+void /*APIENTRY*/glColor4fv (GLfloat *v); -+void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); -+void /*APIENTRY*/glColor4iv (GLint *v); -+void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); -+void /*APIENTRY*/glColor4sv (GLshort *v); -+void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -+void /*APIENTRY*/glColor4ubv (GLubyte *v); -+void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); -+void /*APIENTRY*/glColor4uiv (GLuint *v); -+void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); -+void /*APIENTRY*/glColor4usv (GLushort *v); -+void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -+void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); -+void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); -+void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); -+void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -+void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -+void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -+void /*APIENTRY*/glCullFace (GLenum mode); -+void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); -+void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); -+void /*APIENTRY*/glDepthFunc (GLenum func); -+void /*APIENTRY*/glDepthMask (GLboolean flag); -+void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); -+void /*APIENTRY*/glDisable (GLenum cap); -+void /*APIENTRY*/glDisableClientState (GLenum array); -+void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); -+void /*APIENTRY*/glDrawBuffer (GLenum mode); -+void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); -+void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glEdgeFlag (GLboolean flag); -+void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); -+void /*APIENTRY*/glEnable (GLenum cap); -+void /*APIENTRY*/glEnableClientState (GLenum array); -+void /*APIENTRY*/glEnd (); -+void /*APIENTRY*/glEndList (); -+void /*APIENTRY*/glEvalCoord1d (GLdouble u); -+void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); -+void /*APIENTRY*/glEvalCoord1f (GLfloat u); -+void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); -+void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); -+void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); -+void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); -+void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); -+void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); -+void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); -+void /*APIENTRY*/glEvalPoint1 (GLint i); -+void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); -+void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); -+void /*APIENTRY*/glFinish (); -+void /*APIENTRY*/glFlush (); -+void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glFogi (GLenum pname, GLint param); -+void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); -+void /*APIENTRY*/glFrontFace (GLenum mode); -+void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -+GLuint /*APIENTRY*/glGenLists (GLsizei range); -+void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); -+void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); -+void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); -+void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); -+GLenum /*APIENTRY*/glGetError (); -+void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); -+void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); -+void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); -+void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); -+void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); -+void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); -+void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); -+void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); -+void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); -+GLubyte * /*APIENTRY*/glGetString (GLenum name); -+void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); -+void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glHint (GLenum target, GLenum mode); -+void /*APIENTRY*/glIndexMask (GLuint mask); -+void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glIndexd (GLdouble c); -+void /*APIENTRY*/glIndexdv (GLdouble *c); -+void /*APIENTRY*/glIndexf (GLfloat c); -+void /*APIENTRY*/glIndexfv (GLfloat *c); -+void /*APIENTRY*/glIndexi (GLint c); -+void /*APIENTRY*/glIndexiv (GLint *c); -+void /*APIENTRY*/glIndexs (GLshort c); -+void /*APIENTRY*/glIndexsv (GLshort *c); -+void /*APIENTRY*/glIndexub (GLubyte c); -+void /*APIENTRY*/glIndexubv (GLubyte *c); -+void /*APIENTRY*/glInitNames (); -+void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); -+GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); -+GLboolean /*APIENTRY*/glIsList (GLuint list); -+GLboolean /*APIENTRY*/glIsTexture (GLuint texture); -+void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); -+void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); -+void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); -+void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); -+void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); -+void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); -+void /*APIENTRY*/glLineWidth (GLfloat width); -+void /*APIENTRY*/glListBase (GLuint base); -+void /*APIENTRY*/glLoadIdentity (); -+void /*APIENTRY*/glLoadMatrixd (GLdouble *m); -+void /*APIENTRY*/glLoadMatrixf (GLfloat *m); -+void /*APIENTRY*/glLoadName (GLuint name); -+void /*APIENTRY*/glLogicOp (GLenum opcode); -+void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); -+void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); -+void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); -+void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); -+void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); -+void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); -+void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); -+void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); -+void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); -+void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); -+void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); -+void /*APIENTRY*/glMatrixMode (GLenum mode); -+void /*APIENTRY*/glMultMatrixd (GLdouble *m); -+void /*APIENTRY*/glMultMatrixf (GLfloat *m); -+void /*APIENTRY*/glNewList (GLuint list, GLenum mode); -+void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); -+void /*APIENTRY*/glNormal3bv (GLbyte *v); -+void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); -+void /*APIENTRY*/glNormal3dv (GLdouble *v); -+void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); -+void /*APIENTRY*/glNormal3fv (GLfloat *v); -+void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); -+void /*APIENTRY*/glNormal3iv (GLint *v); -+void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); -+void /*APIENTRY*/glNormal3sv (GLshort *v); -+void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -+void /*APIENTRY*/glPassThrough (GLfloat token); -+void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); -+void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); -+void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); -+void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); -+void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); -+void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); -+void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); -+void /*APIENTRY*/glPointSize (GLfloat size); -+void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); -+void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); -+void /*APIENTRY*/glPolygonStipple (GLubyte *mask); -+void /*APIENTRY*/glPopAttrib (); -+void /*APIENTRY*/glPopClientAttrib (); -+void /*APIENTRY*/glPopMatrix (); -+void /*APIENTRY*/glPopName (); -+void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); -+void /*APIENTRY*/glPushAttrib (GLbitfield mask); -+void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); -+void /*APIENTRY*/glPushMatrix (); -+void /*APIENTRY*/glPushName (GLuint name); -+void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); -+void /*APIENTRY*/glRasterPos2dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); -+void /*APIENTRY*/glRasterPos2fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); -+void /*APIENTRY*/glRasterPos2iv (GLint *v); -+void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); -+void /*APIENTRY*/glRasterPos2sv (GLshort *v); -+void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glRasterPos3dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glRasterPos3fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); -+void /*APIENTRY*/glRasterPos3iv (GLint *v); -+void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); -+void /*APIENTRY*/glRasterPos3sv (GLshort *v); -+void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -+void /*APIENTRY*/glRasterPos4dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -+void /*APIENTRY*/glRasterPos4fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); -+void /*APIENTRY*/glRasterPos4iv (GLint *v); -+void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); -+void /*APIENTRY*/glRasterPos4sv (GLshort *v); -+void /*APIENTRY*/glReadBuffer (GLenum mode); -+void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); -+void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); -+void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); -+void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); -+void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); -+void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); -+void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); -+void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); -+GLint /*APIENTRY*/glRenderMode (GLenum mode); -+void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -+void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); -+void /*APIENTRY*/glShadeModel (GLenum mode); -+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask); -+void /*APIENTRY*/glStencilMask (GLuint mask); -+void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -+void /*APIENTRY*/glTexCoord1d (GLdouble s); -+void /*APIENTRY*/glTexCoord1dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord1f (GLfloat s); -+void /*APIENTRY*/glTexCoord1fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord1i (GLint s); -+void /*APIENTRY*/glTexCoord1iv (GLint *v); -+void /*APIENTRY*/glTexCoord1s (GLshort s); -+void /*APIENTRY*/glTexCoord1sv (GLshort *v); -+void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); -+void /*APIENTRY*/glTexCoord2dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); -+void /*APIENTRY*/glTexCoord2fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); -+void /*APIENTRY*/glTexCoord2iv (GLint *v); -+void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); -+void /*APIENTRY*/glTexCoord2sv (GLshort *v); -+void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); -+void /*APIENTRY*/glTexCoord3dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); -+void /*APIENTRY*/glTexCoord3fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); -+void /*APIENTRY*/glTexCoord3iv (GLint *v); -+void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); -+void /*APIENTRY*/glTexCoord3sv (GLshort *v); -+void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); -+void /*APIENTRY*/glTexCoord4dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); -+void /*APIENTRY*/glTexCoord4fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); -+void /*APIENTRY*/glTexCoord4iv (GLint *v); -+void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); -+void /*APIENTRY*/glTexCoord4sv (GLshort *v); -+void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); -+void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); -+void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); -+void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); -+void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); -+void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); -+void /*APIENTRY*/glVertex2dv (GLdouble *v); -+void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); -+void /*APIENTRY*/glVertex2fv (GLfloat *v); -+void /*APIENTRY*/glVertex2i (GLint x, GLint y); -+void /*APIENTRY*/glVertex2iv (GLint *v); -+void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); -+void /*APIENTRY*/glVertex2sv (GLshort *v); -+void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glVertex3dv (GLdouble *v); -+void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glVertex3fv (GLfloat *v); -+void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); -+void /*APIENTRY*/glVertex3iv (GLint *v); -+void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); -+void /*APIENTRY*/glVertex3sv (GLshort *v); -+void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -+void /*APIENTRY*/glVertex4dv (GLdouble *v); -+void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -+void /*APIENTRY*/glVertex4fv (GLfloat *v); -+void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); -+void /*APIENTRY*/glVertex4iv (GLint *v); -+void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); -+void /*APIENTRY*/glVertex4sv (GLshort *v); -+void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - --extern(Windows): - - /* EXT_vertex_array */ - typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i); -@@ -1483,4 +1479,4 @@ - typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) - (GLenum target, GLenum pname, GLfloat *params); - --import openglu; -\ No newline at end of file -+import openglu; diff -Nru a7xpg-0.11.dfsg1/debian/patches/02_sdl_import_remove_windows_code.diff a7xpg-0.11.dfsg1/debian/patches/02_sdl_import_remove_windows_code.diff --- a7xpg-0.11.dfsg1/debian/patches/02_sdl_import_remove_windows_code.diff 2007-08-25 22:24:16.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/02_sdl_import_remove_windows_code.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:53:42 CEST 2007 pdewacht@gmail.com - * 02_sdl_import_remove_windows_code -diff -rN -u old-a7xpg/import/SDL.d new-a7xpg/import/SDL.d ---- old-a7xpg/import/SDL.d 2007-08-26 00:02:52.000000000 +0200 -+++ new-a7xpg/import/SDL.d 2007-08-26 00:02:52.000000000 +0200 -@@ -73,18 +73,18 @@ - */ - void SDL_Quit(); - --void SDL_SetModuleHandle(void *hInst); --extern(Windows) void* GetModuleHandle(char*); -+//void SDL_SetModuleHandle(void *hInst); -+//extern(Windows) void* GetModuleHandle(char*); - - static this() - { - /* Load SDL dynamic link library */ - if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0) - throw new Error("Error loading SDL"); -- SDL_SetModuleHandle(GetModuleHandle(null)); -+ //SDL_SetModuleHandle(GetModuleHandle(null)); - } - - static ~this() - { - SDL_Quit(); --} -\ No newline at end of file -+} -diff -rN -u old-a7xpg/import/SDL_getenv.d new-a7xpg/import/SDL_getenv.d ---- old-a7xpg/import/SDL_getenv.d 2007-08-26 00:02:52.000000000 +0200 -+++ new-a7xpg/import/SDL_getenv.d 2007-08-26 00:02:52.000000000 +0200 -@@ -1,11 +1,2 @@ - /* Not all environments have a working getenv()/putenv() */ -- --extern(C): -- --/* Put a variable of the form "name=value" into the environment */ --int SDL_putenv(char *variable); --int putenv(char* X) { return SDL_putenv(X); } -- --/* Retrieve a variable named "name" from the environment */ --char *SDL_getenv(char *name); --char *getenv(char* X) { return SDL_getenv(X); } -+/* But Linux has */ - diff -Nru a7xpg-0.11.dfsg1/debian/patches/03_sdl_import_fix_weird_sdl_keysym_problem.diff a7xpg-0.11.dfsg1/debian/patches/03_sdl_import_fix_weird_sdl_keysym_problem.diff --- a7xpg-0.11.dfsg1/debian/patches/03_sdl_import_fix_weird_sdl_keysym_problem.diff 2007-08-25 22:24:16.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/03_sdl_import_fix_weird_sdl_keysym_problem.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:55:05 CEST 2007 pdewacht@gmail.com - * 03_sdl_import_fix_weird_sdl_keysym_problem -diff -rN -u old-a7xpg/import/SDL_events.d new-a7xpg/import/SDL_events.d ---- old-a7xpg/import/SDL_events.d 2007-08-26 00:02:58.000000000 +0200 -+++ new-a7xpg/import/SDL_events.d 2007-08-26 00:02:58.000000000 +0200 -@@ -105,7 +105,7 @@ - Uint8 type; /* SDL_KEYDOWN or SDL_KEYUP */ - Uint8 which; /* The keyboard device index */ - Uint8 state; /* SDL_PRESSED or SDL_RELEASED */ -- SDL_keysym keysym; -+ SDL__keysym keysym; - } - - /* Mouse motion event structure */ -diff -rN -u old-a7xpg/import/SDL_keyboard.d new-a7xpg/import/SDL_keyboard.d ---- old-a7xpg/import/SDL_keyboard.d 2007-08-26 00:02:58.000000000 +0200 -+++ new-a7xpg/import/SDL_keyboard.d 2007-08-26 00:02:58.000000000 +0200 -@@ -26,7 +26,8 @@ - // !!! A hack! struct SDL_keysym is defined in this module, - // !!! so we need to resolve the nameclash... - // !!! Definitely won't work on *NIX but for now will do. --import SDL_Keysym; -+// pdewacht@gmail.com: resolved this by renaming struct SDL_keysym to SDL__keysym -+public import SDL_keysym; - - extern(C): - -@@ -46,7 +47,7 @@ - An international character.. - } - */ --struct SDL_keysym { -+struct SDL__keysym { - Uint8 scancode; /* hardware specific scancode */ - SDLKey sym; /* SDL virtual keysym */ - SDLMod mod; /* current key modifiers */ - diff -Nru a7xpg-0.11.dfsg1/debian/patches/04_sdl_import_d_language_updates.diff a7xpg-0.11.dfsg1/debian/patches/04_sdl_import_d_language_updates.diff --- a7xpg-0.11.dfsg1/debian/patches/04_sdl_import_d_language_updates.diff 2007-08-25 22:24:16.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/04_sdl_import_d_language_updates.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,332 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:55:45 CEST 2007 pdewacht@gmail.com - * 04_sdl_import_d_language_updates -diff -rN -u old-a7xpg/import/SDL_active.d new-a7xpg/import/SDL_active.d ---- old-a7xpg/import/SDL_active.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_active.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* Include file for SDL application focus event handling */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_audio.d new-a7xpg/import/SDL_audio.d ---- old-a7xpg/import/SDL_audio.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_audio.d 2007-08-26 00:03:04.000000000 +0200 -@@ -20,10 +20,10 @@ - slouken@devolution.com - */ - --import SDL_types; --import SDL_error; --import SDL_rwops; --import SDL_byteorder; -+public import SDL_types; -+public import SDL_error; -+public import SDL_rwops; -+public import SDL_byteorder; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_cdrom.d new-a7xpg/import/SDL_cdrom.d ---- old-a7xpg/import/SDL_cdrom.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_cdrom.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* This is the CD-audio control API for Simple DirectMedia Layer */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL.d new-a7xpg/import/SDL.d ---- old-a7xpg/import/SDL.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL.d 2007-08-26 00:03:04.000000000 +0200 -@@ -20,18 +20,18 @@ - slouken@devolution.com - */ - --import SDL_types; --import SDL_getenv; --import SDL_error; --import SDL_rwops; --import SDL_timer; --import SDL_audio; --import SDL_cdrom; --import SDL_joystick; --import SDL_events; --import SDL_video; --import SDL_byteorder; --import SDL_version; -+public import SDL_types; -+public import SDL_getenv; -+public import SDL_error; -+public import SDL_rwops; -+public import SDL_timer; -+public import SDL_audio; -+public import SDL_cdrom; -+public import SDL_joystick; -+public import SDL_events; -+public import SDL_video; -+public import SDL_byteorder; -+public import SDL_version; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_endian.d new-a7xpg/import/SDL_endian.d ---- old-a7xpg/import/SDL_endian.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_endian.d 2007-08-26 00:03:04.000000000 +0200 -@@ -34,9 +34,9 @@ - and other data sources. - */ - --import SDL_types; --import SDL_rwops; --import SDL_byteorder; -+public import SDL_types; -+public import SDL_rwops; -+public import SDL_byteorder; - - extern(C): - -@@ -57,9 +57,9 @@ - Uint64 SDL_Swap64(Uint64 val) { - Uint32 hi, lo; - /* Separate into high and low 32-bit values and swap them */ -- lo = (Uint32)(val&0xFFFFFFFF); -+ lo = cast(Uint32)(val&0xFFFFFFFF); - val >>= 32; -- hi = (Uint32)(val&0xFFFFFFFF); -+ hi = cast(Uint32)(val&0xFFFFFFFF); - val = SDL_Swap32(lo); - val <<= 32; - val |= SDL_Swap32(hi); -diff -rN -u old-a7xpg/import/SDL_events.d new-a7xpg/import/SDL_events.d ---- old-a7xpg/import/SDL_events.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_events.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,12 +22,12 @@ - - /* Include file for SDL event handling */ - --import SDL_types; --import SDL_active; --import SDL_keyboard; --import SDL_mouse; --import SDL_joystick; --import SDL_syswm; -+public import SDL_types; -+public import SDL_active; -+public import SDL_keyboard; -+public import SDL_mouse; -+public import SDL_joystick; -+public import SDL_syswm; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_joystick.d new-a7xpg/import/SDL_joystick.d ---- old-a7xpg/import/SDL_joystick.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_joystick.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* Include file for SDL joystick event handling */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_keyboard.d new-a7xpg/import/SDL_keyboard.d ---- old-a7xpg/import/SDL_keyboard.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_keyboard.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* Include file for SDL keyboard event handling */ - --import SDL_types; -+public import SDL_types; - // !!! A hack! struct SDL_keysym is defined in this module, - // !!! so we need to resolve the nameclash... - // !!! Definitely won't work on *NIX but for now will do. -diff -rN -u old-a7xpg/import/SDL_mixer.d new-a7xpg/import/SDL_mixer.d ---- old-a7xpg/import/SDL_mixer.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_mixer.d 2007-08-26 00:03:04.000000000 +0200 -@@ -24,7 +24,7 @@ - - /* $Id: SDL_mixer.d,v 1.1.1.1 2003/09/19 14:55:49 kenta Exp $ */ - --import SDL; -+public import SDL; - - extern (C) { - -diff -rN -u old-a7xpg/import/SDL_mouse.d new-a7xpg/import/SDL_mouse.d ---- old-a7xpg/import/SDL_mouse.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_mouse.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,8 +22,8 @@ - - /* Include file for SDL mouse event handling */ - --import SDL_types; --import SDL_video; -+public import SDL_types; -+public import SDL_video; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_mutex.d new-a7xpg/import/SDL_mutex.d ---- old-a7xpg/import/SDL_mutex.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_mutex.d 2007-08-26 00:03:04.000000000 +0200 -@@ -25,7 +25,7 @@ - These are independent of the other SDL routines. - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_quit.d new-a7xpg/import/SDL_quit.d ---- old-a7xpg/import/SDL_quit.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_quit.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* Include file for SDL quit event handling */ - --import SDL_events; -+public import SDL_events; - - /* - An SDL_QUITEVENT is generated when the user tries to close the application -@@ -43,5 +43,5 @@ - bit SDL_QuitRequested() - { - SDL_PumpEvents(); -- return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK); -+ return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK) != 0; - } -diff -rN -u old-a7xpg/import/SDL_rwops.d new-a7xpg/import/SDL_rwops.d ---- old-a7xpg/import/SDL_rwops.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_rwops.d 2007-08-26 00:03:04.000000000 +0200 -@@ -24,7 +24,7 @@ - data sources. It can easily be extended to files, memory, etc. - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -@@ -84,35 +84,25 @@ - /* Macros to easily read and write from an SDL_RWops structure */ - int SDL_RWseek(SDL_RWops *ctx, int offset, int whence) - { -- int (*seek)(SDL_RWops *context, int offset, int whence); -- seek = ctx.seek; -- return (*seek)(ctx, offset, whence); -+ return ctx.seek(ctx, offset, whence); - } - - int SDL_RWtell(SDL_RWops *ctx) - { -- int (*seek)(SDL_RWops *context, int offset, int whence); -- seek = ctx.seek; -- return (*seek)(ctx, 0, 1); -+ return ctx.seek(ctx, 0, 1); - } - - int SDL_RWread(SDL_RWops *ctx, void* ptr, int size, int n) - { -- int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); -- read = ctx.read; -- return (*read)(ctx, ptr, size, n); -+ return ctx.read(ctx, ptr, size, n); - } - - int SDL_RWwrite(SDL_RWops *ctx, void* ptr, int size, int n) - { -- int (*write)(SDL_RWops *context, void *ptr, int size, int num); -- write = ctx.write; -- return (*write)(ctx, ptr, size, n); -+ return ctx.write(ctx, ptr, size, n); - } - - int SDL_RWclose(SDL_RWops *ctx) - { -- int (*close)(SDL_RWops *context); -- close = ctx.close; -- return (*close)(ctx); -+ return ctx.close(ctx); - } -diff -rN -u old-a7xpg/import/SDL_syswm.d new-a7xpg/import/SDL_syswm.d ---- old-a7xpg/import/SDL_syswm.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_syswm.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* Include file for SDL custom system window manager hooks */ - --import SDL_version; -+public import SDL_version; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_thread.d new-a7xpg/import/SDL_thread.d ---- old-a7xpg/import/SDL_thread.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_thread.d 2007-08-26 00:03:04.000000000 +0200 -@@ -25,8 +25,8 @@ - These are independent of the other SDL routines. - */ - --import SDL_types; --import SDL_mutex; -+public import SDL_types; -+public import SDL_mutex; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_timer.d new-a7xpg/import/SDL_timer.d ---- old-a7xpg/import/SDL_timer.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_timer.d 2007-08-26 00:03:04.000000000 +0200 -@@ -20,7 +20,7 @@ - slouken@devolution.com - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_version.d new-a7xpg/import/SDL_version.d ---- old-a7xpg/import/SDL_version.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_version.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,7 +22,7 @@ - - /* This header defines the current SDL version */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -diff -rN -u old-a7xpg/import/SDL_video.d new-a7xpg/import/SDL_video.d ---- old-a7xpg/import/SDL_video.d 2007-08-26 00:03:04.000000000 +0200 -+++ new-a7xpg/import/SDL_video.d 2007-08-26 00:03:04.000000000 +0200 -@@ -22,9 +22,9 @@ - - /* Header file for access to the SDL raw framebuffer window */ - --import SDL_types; --import SDL_mutex; --import SDL_rwops; -+public import SDL_types; -+public import SDL_mutex; -+public import SDL_rwops; - - extern(C): - - diff -Nru a7xpg-0.11.dfsg1/debian/patches/05_remove_windows_code.diff a7xpg-0.11.dfsg1/debian/patches/05_remove_windows_code.diff --- a7xpg-0.11.dfsg1/debian/patches/05_remove_windows_code.diff 2007-08-25 22:24:16.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/05_remove_windows_code.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:57:31 CEST 2007 pdewacht@gmail.com - * 05_remove_windows_code -diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xBoot.d new-a7xpg/src/abagames/a7xpg/A7xBoot.d ---- old-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:10.000000000 +0200 -+++ new-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:10.000000000 +0200 -@@ -29,8 +29,7 @@ - } - - private void parseArgs(char[][] args) { -- //for (int i = 1; i < argv.length; i++) { -- for (int i = 0; i < args.length; i++) { -+ for (int i = 1; i < args.length; i++) { - switch (args[i]) { - case "-brightness": - if (i >= args.length - 1) { -@@ -77,9 +76,7 @@ - } - } - --//public int main(char[][] argc) { --private int boot(char[] argl) { -- char[][] args = split(argl); -+public int main(char[][] args) { - screen = new A7xScreen; - input = new Input; - try { -@@ -92,32 +89,3 @@ - mainLoop.loop(); - return EXIT_SUCCESS; - } -- --// Boot as the windows executable. --import windows; -- --extern (C) void gc_init(); --extern (C) void gc_term(); --extern (C) void _minit(); --extern (C) void _moduleCtor(); -- --extern (Windows) --int WinMain(HINSTANCE hInstance, -- HINSTANCE hPrevInstance, -- LPSTR lpCmdLine, -- int nCmdShow) { -- int result; -- -- gc_init(); -- _minit(); -- try { -- _moduleCtor(); -- result = boot(string.toString(lpCmdLine)); -- } catch (Object o) { -- MessageBoxA(null, (char *)o.toString(), "Error", -- MB_OK | MB_ICONEXCLAMATION); -- result = 0; -- } -- gc_term(); -- return result; --} - diff -Nru a7xpg-0.11.dfsg1/debian/patches/06_d_language_changes.diff a7xpg-0.11.dfsg1/debian/patches/06_d_language_changes.diff --- a7xpg-0.11.dfsg1/debian/patches/06_d_language_changes.diff 2008-02-21 21:31:56.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/06_d_language_changes.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,521 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sat Aug 25 23:59:12 CEST 2007 pdewacht@gmail.com - * 06_d_language_changes ---- a/src/abagames/a7xpg/A7xBoot.d -+++ b/src/abagames/a7xpg/A7xBoot.d -@@ -5,13 +5,15 @@ - */ - module abagames.a7xpg.A7xBoot; - --import string; -+import std.string; -+import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE; - import abagames.a7xpg.A7xScreen; - import abagames.a7xpg.A7xGameManager; - import abagames.a7xpg.A7xPrefManager; - import abagames.util.Logger; - import abagames.util.sdl.Input; - import abagames.util.sdl.MainLoop; -+import abagames.util.sdl.Sound; - - /** - * Boot A7Xpg. -@@ -37,7 +39,7 @@ - exit(EXIT_FAILURE); - } - i++; -- float b = (float) atoi(args[i]) / 100; -+ float b = cast(float) atoi(args[i]) / 100; - if (b < 0 || b > 1) { - usage(); - exit(EXIT_FAILURE); -@@ -50,7 +52,7 @@ - exit(EXIT_FAILURE); - } - i++; -- float l = (float) atoi(args[i]) / 100; -+ float l = cast(float) atoi(args[i]) / 100; - if (l < 0 || l > 1) { - usage(); - exit(EXIT_FAILURE); ---- a/src/abagames/a7xpg/A7xGameManager.d -+++ b/src/abagames/a7xpg/A7xGameManager.d -@@ -5,12 +5,13 @@ - */ - module abagames.a7xpg.A7xGameManager; - --import math; -+import std.math; - import opengl; - import SDL; - import abagames.util.Rand; - import abagames.util.GameManager; - import abagames.util.ActorPool; -+import abagames.util.Vector; - import abagames.util.sdl.Screen3D; - import abagames.util.sdl.Texture; - import abagames.util.sdl.Input; -@@ -115,8 +116,8 @@ - int enemyTableIdx, enemyNum; - - public override void init() { -- prefManager = (A7xPrefManager) abstPrefManager; -- screen = (A7xScreen) abstScreen; -+ prefManager = cast(A7xPrefManager) abstPrefManager; -+ screen = cast(A7xScreen) abstScreen; - screen.makeLuminousTexture(); - rand = new Rand; - field = new Field; -@@ -189,7 +190,7 @@ - } - - public void addGold() { -- Gold gold = (Gold) golds.getInstance(); -+ Gold gold = cast(Gold) golds.getInstance(); - assert(gold); - gold.set(); - } -@@ -210,14 +211,14 @@ - - public void addBonus(int sc, Vector pos, float size) { - addScore(sc); -- Bonus bonus = (Bonus) bonuses.getInstanceForced(); -+ Bonus bonus = cast(Bonus) bonuses.getInstanceForced(); - assert(bonus); - bonus.set(sc, pos, size); - } - - public void getGold() { - playSe(0); -- addBonus(((int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); -+ addBonus((cast(int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); - leftGold--; - if (leftGold - appGold >= 0) - addGold(); -@@ -235,14 +236,14 @@ - - public void addEnemy(int type, float size, float speed) { - playSe(5); -- Enemy enemy = (Enemy) enemies.getInstance(); -+ Enemy enemy = cast(Enemy) enemies.getInstance(); - if (!enemy) return; - enemy.set(type, size, speed); - } - - public void addParticle(Vector pos, float deg, float ofs, float speed, - float r, float g, float b) { -- Particle pt = (Particle) particles.getInstanceForced(); -+ Particle pt = cast(Particle) particles.getInstanceForced(); - assert(pt); - pt.set(pos, deg, ofs, speed, r, g, b); - } -@@ -254,14 +255,14 @@ - field.size.y = stgData[st][1]; - field.eyeZ = 300; - field.alpha = 1; -- stageTimer = stgData[st][2] * 60; -- leftGold = stgData[st][3]; -- appGold = stgData[st][4]; -- enemyAppInterval = stgData[st][5]; -+ stageTimer = cast(int)(stgData[st][2] * 60); -+ leftGold = cast(int)stgData[st][3]; -+ appGold = cast(int)stgData[st][4]; -+ enemyAppInterval = cast(int)(stgData[st][5]); - int ei = 0; - for (int i = 6; i < stgData[st].length;) { -- int n = stgData[st][i]; i++; -- int tp = stgData[st][i]; i++; -+ int n = cast(int)stgData[st][i]; i++; -+ int tp = cast(int)stgData[st][i]; i++; - float sz = stgData[st][i]; i++; - float sp = stgData[st][i]; i++; - for (int j = 0; j < n; j++) { -@@ -374,7 +375,7 @@ - if (enemyTableIdx == 0 && lap >= 1) { - int ei = enemyNum - 1; - for (int i = 0; i < lap * 2; i++) { -- addEnemy(enemyTable[ei][0], -+ addEnemy(cast(int)enemyTable[ei][0], - enemyTable[ei][1] * (1 + lap * 0.1), - enemyTable[ei][2] * (1 + lap * 0.1)); - ei--; -@@ -383,7 +384,7 @@ - } - } - enemyTimer = enemyAppInterval; -- addEnemy(enemyTable[enemyTableIdx][0], -+ addEnemy(cast(int)enemyTable[enemyTableIdx][0], - enemyTable[enemyTableIdx][1], - enemyTable[enemyTableIdx][2]); - enemyTableIdx++; ---- a/src/abagames/a7xpg/A7xPrefManager.d -+++ b/src/abagames/a7xpg/A7xPrefManager.d -@@ -30,7 +30,7 @@ - if (ver != VERSION_NUM) - throw new Error("Wrong version num"); - fd.read(hiScore); -- } catch (Error e) { -+ } catch (Exception e) { - init(); - } finally { - fd.close(); ---- a/src/abagames/a7xpg/A7xScreen.d -+++ b/src/abagames/a7xpg/A7xScreen.d -@@ -6,6 +6,7 @@ - module abagames.a7xpg.A7xScreen; - - import opengl; -+import std.c.string; - import abagames.util.sdl.Screen3D; - - /** -@@ -40,13 +41,13 @@ - GLuint luminousTexture; - const int LUMINOUS_TEXTURE_WIDTH_MAX = 128; - const int LUMINOUS_TEXTURE_HEIGHT_MAX = 128; -- GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.size]; -+ GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.sizeof]; - int luminousTextureWidth = 128, luminousTextureHeight = 128; - - public void makeLuminousTexture() { -- uint *data = td; -+ uint *data = cast(uint *)td; - int i; -- memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.size); -+ memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof); - glGenTextures(1, &luminousTexture); - glBindTexture(GL_TEXTURE_2D, luminousTexture); - glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0, ---- a/src/abagames/a7xpg/Bonus.d -+++ b/src/abagames/a7xpg/Bonus.d -@@ -36,7 +36,7 @@ - tn /= 10; - pos.x = p.x - s / 2 * tn; pos.y = p.y; - size = s; -- cnt = 32 + s * 24; -+ cnt = cast(int)(32 + s * 24); - my = 0.03 + s * 0.2; - isExist = true; - } ---- a/src/abagames/a7xpg/Enemy.d -+++ b/src/abagames/a7xpg/Enemy.d -@@ -5,13 +5,15 @@ - */ - module abagames.a7xpg.Enemy; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; - import abagames.util.ActorInitializer; - import abagames.a7xpg.LuminousActor; - import abagames.a7xpg.Ship; -+import abagames.a7xpg.Field; - import abagames.a7xpg.A7xGameManager; - import abagames.a7xpg.A7xScreen; - -@@ -48,7 +50,7 @@ - } - - public override void init(ActorInitializer ini) { -- EnemyInitializer ei = (EnemyInitializer) ini; -+ EnemyInitializer ei = cast(EnemyInitializer) ini; - ship = ei.ship; - field = ei.field; - rand = ei.rand; ---- a/src/abagames/a7xpg/Gold.d -+++ b/src/abagames/a7xpg/Gold.d -@@ -5,7 +5,8 @@ - */ - module abagames.a7xpg.Gold; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -37,7 +38,7 @@ - } - - public override void init(ActorInitializer ini) { -- GoldInitializer gi = (GoldInitializer) ini; -+ GoldInitializer gi = cast(GoldInitializer) ini; - ship = gi.ship; - field = gi.field; - rand = gi.rand; ---- a/src/abagames/a7xpg/LetterRender.d -+++ b/src/abagames/a7xpg/LetterRender.d -@@ -123,7 +123,7 @@ - float x, y, length, size, t; - int deg; - for ( i=0 ; ; i++ ) { -- deg = (int) spData[idx][i][4]; -+ deg = cast(int) spData[idx][i][4]; - if (deg > 99990) break; - x = -spData[idx][i][0]; - y = -spData[idx][i][1]; ---- a/src/abagames/a7xpg/LuminousActor.d -+++ b/src/abagames/a7xpg/LuminousActor.d -@@ -5,7 +5,7 @@ - */ - module abagames.a7xpg.LuminousActor; - --import abagames.util.Actor; -+public import abagames.util.Actor; - - /** - * Actor with the luminous effect. ---- a/src/abagames/a7xpg/LuminousActorPool.d -+++ b/src/abagames/a7xpg/LuminousActorPool.d -@@ -21,7 +21,7 @@ - public void drawLuminous() { - for (int i = 0; i < actor.length; i++) { - if (actor[i].isExist) -- ((LuminousActor) actor[i]).drawLuminous(); -+ (cast(LuminousActor) actor[i]).drawLuminous(); - } - } - } ---- a/src/abagames/a7xpg/Particle.d -+++ b/src/abagames/a7xpg/Particle.d -@@ -5,7 +5,7 @@ - */ - module abagames.a7xpg.Particle; - --import math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -34,7 +34,7 @@ - } - - public override void init(ActorInitializer ini) { -- ParticleInitializer pi = (ParticleInitializer) ini; -+ ParticleInitializer pi = cast(ParticleInitializer) ini; - field = pi.field; - rand = pi.rand; - pos = new Vector; ---- a/src/abagames/a7xpg/Ship.d -+++ b/src/abagames/a7xpg/Ship.d -@@ -5,7 +5,8 @@ - */ - module abagames.a7xpg.Ship; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -237,7 +238,7 @@ - manager.addParticle(pos, deg + math.PI + rand.nextFloat(0.5) - 0.25, SIZE, ps, pr, pg, pb); - } - if (hitWall && pSpeed > DEFAULT_SPEED * 1.1) { -- int pn = pSpeed / (DEFAULT_SPEED / 4); -+ int pn = cast(int)(pSpeed / (DEFAULT_SPEED / 4)); - for (int i = 0; i < pn; i++) { - manager.addParticle(pos, deg + rand.nextFloat(1.2) - 0.6, SIZE, pSpeed * 3, - 0.8, 0.6, 0.1); ---- a/src/abagames/util/Actor.d -+++ b/src/abagames/util/Actor.d -@@ -5,7 +5,7 @@ - */ - module abagames.util.Actor; - --import abagames.util.ActorInitializer; -+public import abagames.util.ActorInitializer; - - /** - * Actor in the game that has the interface to move and draw. ---- a/src/abagames/util/Logger.d -+++ b/src/abagames/util/Logger.d -@@ -5,28 +5,28 @@ - */ - module abagames.util.Logger; - --import stream; -+import std.cstream; - - /** - * Logger(error/info). - */ - public class Logger { - public static void info(char[] msg) { -- stderr.writeLine("Info: " ~ msg); -+ derr.writeLine("Info: " ~ msg); - } - - public static void error(char[] msg) { -- //stderr.writeLine("Error: " ~ msg); -+ //derr.writeLine("Error: " ~ msg); - throw new Exception("Error: " ~ msg ~ "\0"); - } - - public static void error(Exception e) { -- //stderr.writeLine("Error: " ~ e.toString()); -+ //derr.writeLine("Error: " ~ e.toString()); - throw new Exception("Error: " ~ e.toString() ~ "\0"); - } - - public static void error(Error e) { -- //stderr.writeLine("Error: " ~ e.toString()); -+ //derr.writeLine("Error: " ~ e.toString()); - //if (e.next) - // error(e.next); - throw new Exception("Error: " ~ e.toString() ~ "\0"); ---- a/src/abagames/util/Rand.d -+++ b/src/abagames/util/Rand.d -@@ -5,8 +5,8 @@ - */ - module abagames.util.Rand; - --import random; --import date; -+import std.random; -+import std.date; - - /** - * Random number generator. -@@ -19,14 +19,14 @@ - } - - public int nextInt(int n) { -- return random.rand() % n; -+ return rand() % n; - } - - public int nextSignedInt(int n) { -- return random.rand() % (n * 2) - n; -+ return rand() % (n * 2) - n; - } - - public float nextFloat(float n) { -- return ((float)(random.rand() % (n * 10000))) / 10000; -+ return (cast(float)(rand() % (n * 10000))) / 10000; - } - } ---- a/src/abagames/util/sdl/Input.d -+++ b/src/abagames/util/sdl/Input.d -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Input; - --import string; -+import string = std.string; - import SDL; - import abagames.util.sdl.SDLInitFailedException; - ---- a/src/abagames/util/sdl/MainLoop.d -+++ b/src/abagames/util/sdl/MainLoop.d -@@ -5,8 +5,7 @@ - */ - module abagames.util.sdl.MainLoop; - --import string; --import c.stdlib; -+import std.c.stdlib; - import SDL; - import abagames.util.Logger; - import abagames.util.Rand; -@@ -88,7 +87,7 @@ - done = 1; - - nowTick = SDL_GetTicks(); -- frame = (int) (nowTick-prvTickCount) / interval; -+ frame = cast(int) (nowTick-prvTickCount) / interval; - if (frame <= 0) { - frame = 1; - SDL_Delay(prvTickCount+interval-nowTick); ---- a/src/abagames/util/sdl/Screen3D.d -+++ b/src/abagames/util/sdl/Screen3D.d -@@ -5,8 +5,8 @@ - */ - module abagames.util.sdl.Screen3D; - --import string; --import c.stdlib; -+import string = std.string; -+import std.c.stdlib; - import SDL; - import opengl; - import abagames.util.Logger; -@@ -64,11 +64,11 @@ - glViewport(0, 0, width, height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); -- //gluPerspective(45.0f, (GLfloat)width/(GLfloat)height, nearPlane, farPlane); -+ //gluPerspective(45.0f, cast(GLfloat)width/cast(GLfloat)height, nearPlane, farPlane); - glFrustum(-nearPlane, - nearPlane, -- -nearPlane * (GLfloat)height / (GLfloat)width, -- nearPlane * (GLfloat)height / (GLfloat)width, -+ -nearPlane * cast(GLfloat)height / cast(GLfloat)width, -+ nearPlane * cast(GLfloat)height / cast(GLfloat)width, - 0.1f, farPlane); - glMatrixMode(GL_MODELVIEW); - } ---- a/src/abagames/util/sdl/Sound.d -+++ b/src/abagames/util/sdl/Sound.d -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Sound; - --import string; -+import string = std.string; - import SDL; - import SDL_mixer; - import abagames.util.sdl.SDLInitFailedException; ---- a/src/abagames/util/sdl/Texture.d -+++ b/src/abagames/util/sdl/Texture.d -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Texture; - --import string; -+import string = std.string; - import opengl; - import SDL; - import abagames.util.sdl.SDLInitFailedException; ---- a/src/abagames/util/Vector.d -+++ b/src/abagames/util/Vector.d -@@ -5,7 +5,7 @@ - */ - module abagames.util.Vector; - --import math; -+import std.math; - - /** - * Vector. -@@ -60,19 +60,19 @@ - } - - public int checkSide(Vector pos1, Vector pos2) { -- int xo = pos2.x - pos1.x; -- int yo = pos2.y - pos1.y; -+ int xo = cast(int)(pos2.x - pos1.x); -+ int yo = cast(int)(pos2.y - pos1.y); - if (xo == 0) { - if (yo == 0) - return 0; -- return x - pos1.x; -+ return cast(int)(x - pos1.x); - } else if (yo == 0) { -- return pos1.y - y; -+ return cast(int)(pos1.y - y); - } else { - if (xo * yo > 0) { -- return (x - pos1.x) / xo - (y - pos1.y) / yo; -+ return cast(int)((x - pos1.x) / xo - (y - pos1.y) / yo); - } else { -- return -(x - pos1.x) / xo + (y - pos1.y) / yo; -+ return cast(int)(-(x - pos1.x) / xo + (y - pos1.y) / yo); - } - } - } diff -Nru a7xpg-0.11.dfsg1/debian/patches/07_store_prefs_in_home_dir.diff a7xpg-0.11.dfsg1/debian/patches/07_store_prefs_in_home_dir.diff --- a7xpg-0.11.dfsg1/debian/patches/07_store_prefs_in_home_dir.diff 2007-08-26 22:45:56.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/07_store_prefs_in_home_dir.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sun Aug 26 00:00:45 CEST 2007 pdewacht@gmail.com - * 07_store_prefs_in_home_dir -Index: a7xpg_0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d -=================================================================== ---- a7xpg_0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 23:45:46.000000000 +0200 -+++ a7xpg_0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 23:47:15.000000000 +0200 -@@ -5,7 +5,9 @@ - */ - module abagames.a7xpg.A7xPrefManager; - --import stream; -+import std.stream; -+import std.c.stdlib; -+import std.string; - import abagames.util.PrefManager; - - /** -@@ -14,18 +16,25 @@ - public class A7xPrefManager: PrefManager { - public: - static const int VERSION_NUM = 10; -- static const char[] PREF_FILE = "a7xpg.prf"; -+ static const char[] PREF_FILE = ".a7xpg.prf"; - int hiScore; - - private void init() { - hiScore = 0; - } - -+ public char[] pref_file() { -+ char * home = getenv("HOME"); -+ if (home is null) -+ throw new Error("HOME environment variable is not defined"); -+ return std.string.toString(home) ~ "/" ~ PREF_FILE; -+ } -+ - public void load() { - auto File fd = new File; - try { - int ver; -- fd.open(PREF_FILE); -+ fd.open(pref_file()); - fd.read(ver); - if (ver != VERSION_NUM) - throw new Error("Wrong version num"); -@@ -39,7 +48,7 @@ - - public void save() { - auto File fd = new File; -- fd.create(PREF_FILE); -+ fd.create(pref_file()); - fd.write(VERSION_NUM); - fd.write(hiScore); - fd.close(); diff -Nru a7xpg-0.11.dfsg1/debian/patches/08_adapt_build_file_to_linux_gdc.diff a7xpg-0.11.dfsg1/debian/patches/08_adapt_build_file_to_linux_gdc.diff --- a7xpg-0.11.dfsg1/debian/patches/08_adapt_build_file_to_linux_gdc.diff 2007-08-25 22:24:16.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/08_adapt_build_file_to_linux_gdc.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Sun Aug 26 00:01:13 CEST 2007 pdewacht@gmail.com - * 08_adapt_build_file_to_linux_gdc -diff -rN -u old-a7xpg/build.xml new-a7xpg/build.xml ---- old-a7xpg/build.xml 2007-08-26 00:03:27.000000000 +0200 -+++ new-a7xpg/build.xml 2007-08-26 00:03:27.000000000 +0200 -@@ -2,11 +2,8 @@ - - - -- -- -- - -- -+ - - - -@@ -15,11 +12,11 @@ - - - -- -- -+ -+ - -- -- -+ -+ - - - -@@ -30,14 +27,14 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -45,7 +42,7 @@ - - - -- -+ - - - -@@ -59,12 +56,13 @@ - - - -- -- -+ -+ - - - - -+ - - - - diff -Nru a7xpg-0.11.dfsg1/debian/patches/d1.043.patch a7xpg-0.11.dfsg1/debian/patches/d1.043.patch --- a7xpg-0.11.dfsg1/debian/patches/d1.043.patch 2010-03-17 23:39:20.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/d1.043.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,371 +0,0 @@ -Description: Patches to conform to the D 1.043 language. -Author: Peter De Wachter -Bug-Debian: http://bugs.debian.org/574310 - ---- a/src/abagames/a7xpg/Field.d -+++ b/src/abagames/a7xpg/Field.d -@@ -32,7 +32,7 @@ - } - - private const float[][] COLOR = -- [[0.4, 0.8, 1], [0.4, 1, 0.8], [1, 0.8, 0.4]]; -+ [[0.4, 0.8, 1], [0.4, 1, 0.8], [1.0, 0.8, 0.4]]; - private const float[][] LUMINOUS_COLOR = - [[0.2, 0.2, 1], [0.2, 0.6, 0.7], [0.6, 0.2, 0.7]]; - ---- a/src/abagames/a7xpg/LetterRender.d -+++ b/src/abagames/a7xpg/LetterRender.d -@@ -156,240 +156,240 @@ - - private static float[5][16][] spData = - [[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.6f, 0.55f, 0.65f, 0.3f, 90], [0.6f, 0.55f, 0.65f, 0.3f, 90], - [-0.6f, -0.55f, 0.65f, 0.3f, 90], [0.6f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [0.65f, 0.55f, 0.65f, 0.3f, 90], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - //A -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.1f, 1.15f, 0.45f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.45f, 0.55f, 0.65f, 0.3f, 90], - [-0.1f, 0, 0.45f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.1f, 1.15f, 0.45f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.45f, 0.4f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[// F -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], - [0.25f, 0, 0.25f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.75f, 0.25f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[//K - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.45f, 0.55f, 0.65f, 0.3f, 90], - [-0.1f, 0, 0.45f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.3f, 1.15f, 0.25f, 0.3f, 0], [0.3f, 1.15f, 0.25f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[//P -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -+ [0f, -1.15f, 0.65f, 0.3f, 0], - [0.2f, -0.6f, 0.45f, 0.3f, 360-300], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.1f, 0, 0.45f, 0.3f, 0], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.45f, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [-0.65f, 0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0.65f, 0.3f, 0], - [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.4f, 1.15f, 0.45f, 0.3f, 0], [0.4f, 1.15f, 0.45f, 0.3f, 0], -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[//U - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.5f, -0.55f, 0.65f, 0.3f, 90], [0.5f, -0.55f, 0.65f, 0.3f, 90], -- [0, -1.15f, 0.45f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.45f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.65f, 0.55f, 0.65f, 0.3f, 90], [0.65f, 0.55f, 0.65f, 0.3f, 90], - [-0.65f, -0.55f, 0.65f, 0.3f, 90], [0.65f, -0.55f, 0.65f, 0.3f, 90], - [-0.3f, -1.15f, 0.25f, 0.3f, 0], [0.3f, -1.15f, 0.25f, 0.3f, 0], -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.4f, 0.6f, 0.85f, 0.3f, 360-120], - [0.4f, 0.6f, 0.85f, 0.3f, 360-60], - [-0.4f, -0.6f, 0.85f, 0.3f, 360-240], - [0.4f, -0.6f, 0.85f, 0.3f, 360-300], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0, 0, 99999], - ],[ - [-0.4f, 0.6f, 0.85f, 0.3f, 360-120], - [0.4f, 0.6f, 0.85f, 0.3f, 360-60], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[ -- [0, 1.15f, 0.65f, 0.3f, 0], -+ [0f, 1.15f, 0.65f, 0.3f, 0], - [0.35f, 0.5f, 0.65f, 0.3f, 360-60], - [-0.35f, -0.5f, 0.65f, 0.3f, 360-240], -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[// . -- [0, -1.15f, 0.05f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.05f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[// _ -- [0, -1.15f, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, -1.15f, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[// - -- [0, 0, 0.65f, 0.3f, 0], -- [0, 0, 0, 0, 99999], -+ [0f, 0, 0.65f, 0.3f, 0], -+ [0f, 0, 0, 0, 99999], - ],[//+ - [-0.4f, 0, 0.45f, 0.3f, 0], [0.4f, 0, 0.45f, 0.3f, 0], -- [0, 0.55f, 0.65f, 0.3f, 90], -- [0, -0.55f, 0.65f, 0.3f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 0.55f, 0.65f, 0.3f, 90], -+ [0f, -0.55f, 0.65f, 0.3f, 90], -+ [0f, 0, 0, 0, 99999], - ],[//' -- [0, 1.0f, 0.4f, 0.2f, 90], -- [0, 0, 0, 0, 99999], -+ [0f, 1.0f, 0.4f, 0.2f, 90], -+ [0f, 0, 0, 0, 99999], - ],[//'' - [-0.19f, 1.0f, 0.4f, 0.2f, 90], - [0.2f, 1.0f, 0.4f, 0.2f, 90], -- [0, 0, 0, 0, 99999], -- ]]; -+ [0f, 0, 0, 0, 99999], -+ ],]; - } diff -Nru a7xpg-0.11.dfsg1/debian/patches/d_language_changes.diff a7xpg-0.11.dfsg1/debian/patches/d_language_changes.diff --- a7xpg-0.11.dfsg1/debian/patches/d_language_changes.diff 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/d_language_changes.diff 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1,521 @@ +# Copyright (C) 2007 Peter De Wachter +# Distributed under the same license as the game. See debian/copyright. + +Sat Aug 25 23:59:12 CEST 2007 pdewacht@gmail.com + * 06_d_language_changes +--- a/src/abagames/a7xpg/A7xBoot.d ++++ b/src/abagames/a7xpg/A7xBoot.d +@@ -5,13 +5,15 @@ + */ + module abagames.a7xpg.A7xBoot; + +-import string; ++import std.string; ++import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE; + import abagames.a7xpg.A7xScreen; + import abagames.a7xpg.A7xGameManager; + import abagames.a7xpg.A7xPrefManager; + import abagames.util.Logger; + import abagames.util.sdl.Input; + import abagames.util.sdl.MainLoop; ++import abagames.util.sdl.Sound; + + /** + * Boot A7Xpg. +@@ -37,7 +39,7 @@ + exit(EXIT_FAILURE); + } + i++; +- float b = (float) atoi(args[i]) / 100; ++ float b = cast(float) atoi(args[i]) / 100; + if (b < 0 || b > 1) { + usage(); + exit(EXIT_FAILURE); +@@ -50,7 +52,7 @@ + exit(EXIT_FAILURE); + } + i++; +- float l = (float) atoi(args[i]) / 100; ++ float l = cast(float) atoi(args[i]) / 100; + if (l < 0 || l > 1) { + usage(); + exit(EXIT_FAILURE); +--- a/src/abagames/a7xpg/A7xGameManager.d ++++ b/src/abagames/a7xpg/A7xGameManager.d +@@ -5,12 +5,13 @@ + */ + module abagames.a7xpg.A7xGameManager; + +-import math; ++import std.math; + import opengl; + import SDL; + import abagames.util.Rand; + import abagames.util.GameManager; + import abagames.util.ActorPool; ++import abagames.util.Vector; + import abagames.util.sdl.Screen3D; + import abagames.util.sdl.Texture; + import abagames.util.sdl.Input; +@@ -115,8 +116,8 @@ + int enemyTableIdx, enemyNum; + + public override void init() { +- prefManager = (A7xPrefManager) abstPrefManager; +- screen = (A7xScreen) abstScreen; ++ prefManager = cast(A7xPrefManager) abstPrefManager; ++ screen = cast(A7xScreen) abstScreen; + screen.makeLuminousTexture(); + rand = new Rand; + field = new Field; +@@ -189,7 +190,7 @@ + } + + public void addGold() { +- Gold gold = (Gold) golds.getInstance(); ++ Gold gold = cast(Gold) golds.getInstance(); + assert(gold); + gold.set(); + } +@@ -210,14 +211,14 @@ + + public void addBonus(int sc, Vector pos, float size) { + addScore(sc); +- Bonus bonus = (Bonus) bonuses.getInstanceForced(); ++ Bonus bonus = cast(Bonus) bonuses.getInstanceForced(); + assert(bonus); + bonus.set(sc, pos, size); + } + + public void getGold() { + playSe(0); +- addBonus(((int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); ++ addBonus((cast(int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); + leftGold--; + if (leftGold - appGold >= 0) + addGold(); +@@ -235,14 +236,14 @@ + + public void addEnemy(int type, float size, float speed) { + playSe(5); +- Enemy enemy = (Enemy) enemies.getInstance(); ++ Enemy enemy = cast(Enemy) enemies.getInstance(); + if (!enemy) return; + enemy.set(type, size, speed); + } + + public void addParticle(Vector pos, float deg, float ofs, float speed, + float r, float g, float b) { +- Particle pt = (Particle) particles.getInstanceForced(); ++ Particle pt = cast(Particle) particles.getInstanceForced(); + assert(pt); + pt.set(pos, deg, ofs, speed, r, g, b); + } +@@ -254,14 +255,14 @@ + field.size.y = stgData[st][1]; + field.eyeZ = 300; + field.alpha = 1; +- stageTimer = stgData[st][2] * 60; +- leftGold = stgData[st][3]; +- appGold = stgData[st][4]; +- enemyAppInterval = stgData[st][5]; ++ stageTimer = cast(int)(stgData[st][2] * 60); ++ leftGold = cast(int)stgData[st][3]; ++ appGold = cast(int)stgData[st][4]; ++ enemyAppInterval = cast(int)(stgData[st][5]); + int ei = 0; + for (int i = 6; i < stgData[st].length;) { +- int n = stgData[st][i]; i++; +- int tp = stgData[st][i]; i++; ++ int n = cast(int)stgData[st][i]; i++; ++ int tp = cast(int)stgData[st][i]; i++; + float sz = stgData[st][i]; i++; + float sp = stgData[st][i]; i++; + for (int j = 0; j < n; j++) { +@@ -374,7 +375,7 @@ + if (enemyTableIdx == 0 && lap >= 1) { + int ei = enemyNum - 1; + for (int i = 0; i < lap * 2; i++) { +- addEnemy(enemyTable[ei][0], ++ addEnemy(cast(int)enemyTable[ei][0], + enemyTable[ei][1] * (1 + lap * 0.1), + enemyTable[ei][2] * (1 + lap * 0.1)); + ei--; +@@ -383,7 +384,7 @@ + } + } + enemyTimer = enemyAppInterval; +- addEnemy(enemyTable[enemyTableIdx][0], ++ addEnemy(cast(int)enemyTable[enemyTableIdx][0], + enemyTable[enemyTableIdx][1], + enemyTable[enemyTableIdx][2]); + enemyTableIdx++; +--- a/src/abagames/a7xpg/A7xPrefManager.d ++++ b/src/abagames/a7xpg/A7xPrefManager.d +@@ -30,7 +30,7 @@ + if (ver != VERSION_NUM) + throw new Error("Wrong version num"); + fd.read(hiScore); +- } catch (Error e) { ++ } catch (Exception e) { + init(); + } finally { + fd.close(); +--- a/src/abagames/a7xpg/A7xScreen.d ++++ b/src/abagames/a7xpg/A7xScreen.d +@@ -6,6 +6,7 @@ + module abagames.a7xpg.A7xScreen; + + import opengl; ++import std.c.string; + import abagames.util.sdl.Screen3D; + + /** +@@ -40,13 +41,13 @@ + GLuint luminousTexture; + const int LUMINOUS_TEXTURE_WIDTH_MAX = 128; + const int LUMINOUS_TEXTURE_HEIGHT_MAX = 128; +- GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.size]; ++ GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.sizeof]; + int luminousTextureWidth = 128, luminousTextureHeight = 128; + + public void makeLuminousTexture() { +- uint *data = td; ++ uint *data = td.ptr; + int i; +- memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.size); ++ memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof); + glGenTextures(1, &luminousTexture); + glBindTexture(GL_TEXTURE_2D, luminousTexture); + glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0, +--- a/src/abagames/a7xpg/Bonus.d ++++ b/src/abagames/a7xpg/Bonus.d +@@ -36,7 +36,7 @@ + tn /= 10; + pos.x = p.x - s / 2 * tn; pos.y = p.y; + size = s; +- cnt = 32 + s * 24; ++ cnt = cast(int)(32 + s * 24); + my = 0.03 + s * 0.2; + isExist = true; + } +--- a/src/abagames/a7xpg/Enemy.d ++++ b/src/abagames/a7xpg/Enemy.d +@@ -5,13 +5,15 @@ + */ + module abagames.a7xpg.Enemy; + +-import math; ++import math = std.math; ++import std.math; + import opengl; + import abagames.util.Vector; + import abagames.util.Rand; + import abagames.util.ActorInitializer; + import abagames.a7xpg.LuminousActor; + import abagames.a7xpg.Ship; ++import abagames.a7xpg.Field; + import abagames.a7xpg.A7xGameManager; + import abagames.a7xpg.A7xScreen; + +@@ -48,7 +50,7 @@ + } + + public override void init(ActorInitializer ini) { +- EnemyInitializer ei = (EnemyInitializer) ini; ++ EnemyInitializer ei = cast(EnemyInitializer) ini; + ship = ei.ship; + field = ei.field; + rand = ei.rand; +--- a/src/abagames/a7xpg/Gold.d ++++ b/src/abagames/a7xpg/Gold.d +@@ -5,7 +5,8 @@ + */ + module abagames.a7xpg.Gold; + +-import math; ++import math = std.math; ++import std.math; + import opengl; + import abagames.util.Vector; + import abagames.util.Rand; +@@ -37,7 +38,7 @@ + } + + public override void init(ActorInitializer ini) { +- GoldInitializer gi = (GoldInitializer) ini; ++ GoldInitializer gi = cast(GoldInitializer) ini; + ship = gi.ship; + field = gi.field; + rand = gi.rand; +--- a/src/abagames/a7xpg/LetterRender.d ++++ b/src/abagames/a7xpg/LetterRender.d +@@ -123,7 +123,7 @@ + float x, y, length, size, t; + int deg; + for ( i=0 ; ; i++ ) { +- deg = (int) spData[idx][i][4]; ++ deg = cast(int) spData[idx][i][4]; + if (deg > 99990) break; + x = -spData[idx][i][0]; + y = -spData[idx][i][1]; +--- a/src/abagames/a7xpg/LuminousActor.d ++++ b/src/abagames/a7xpg/LuminousActor.d +@@ -5,7 +5,7 @@ + */ + module abagames.a7xpg.LuminousActor; + +-import abagames.util.Actor; ++public import abagames.util.Actor; + + /** + * Actor with the luminous effect. +--- a/src/abagames/a7xpg/LuminousActorPool.d ++++ b/src/abagames/a7xpg/LuminousActorPool.d +@@ -21,7 +21,7 @@ + public void drawLuminous() { + for (int i = 0; i < actor.length; i++) { + if (actor[i].isExist) +- ((LuminousActor) actor[i]).drawLuminous(); ++ (cast(LuminousActor) actor[i]).drawLuminous(); + } + } + } +--- a/src/abagames/a7xpg/Particle.d ++++ b/src/abagames/a7xpg/Particle.d +@@ -5,7 +5,7 @@ + */ + module abagames.a7xpg.Particle; + +-import math; ++import std.math; + import opengl; + import abagames.util.Vector; + import abagames.util.Rand; +@@ -34,7 +34,7 @@ + } + + public override void init(ActorInitializer ini) { +- ParticleInitializer pi = (ParticleInitializer) ini; ++ ParticleInitializer pi = cast(ParticleInitializer) ini; + field = pi.field; + rand = pi.rand; + pos = new Vector; +--- a/src/abagames/a7xpg/Ship.d ++++ b/src/abagames/a7xpg/Ship.d +@@ -5,7 +5,8 @@ + */ + module abagames.a7xpg.Ship; + +-import math; ++import math = std.math; ++import std.math; + import opengl; + import abagames.util.Vector; + import abagames.util.Rand; +@@ -237,7 +238,7 @@ + manager.addParticle(pos, deg + math.PI + rand.nextFloat(0.5) - 0.25, SIZE, ps, pr, pg, pb); + } + if (hitWall && pSpeed > DEFAULT_SPEED * 1.1) { +- int pn = pSpeed / (DEFAULT_SPEED / 4); ++ int pn = cast(int)(pSpeed / (DEFAULT_SPEED / 4)); + for (int i = 0; i < pn; i++) { + manager.addParticle(pos, deg + rand.nextFloat(1.2) - 0.6, SIZE, pSpeed * 3, + 0.8, 0.6, 0.1); +--- a/src/abagames/util/Actor.d ++++ b/src/abagames/util/Actor.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.Actor; + +-import abagames.util.ActorInitializer; ++public import abagames.util.ActorInitializer; + + /** + * Actor in the game that has the interface to move and draw. +--- a/src/abagames/util/Logger.d ++++ b/src/abagames/util/Logger.d +@@ -5,28 +5,28 @@ + */ + module abagames.util.Logger; + +-import stream; ++import std.cstream; + + /** + * Logger(error/info). + */ + public class Logger { + public static void info(char[] msg) { +- stderr.writeLine("Info: " ~ msg); ++ derr.writeLine("Info: " ~ msg); + } + + public static void error(char[] msg) { +- //stderr.writeLine("Error: " ~ msg); ++ //derr.writeLine("Error: " ~ msg); + throw new Exception("Error: " ~ msg ~ "\0"); + } + + public static void error(Exception e) { +- //stderr.writeLine("Error: " ~ e.toString()); ++ //derr.writeLine("Error: " ~ e.toString()); + throw new Exception("Error: " ~ e.toString() ~ "\0"); + } + + public static void error(Error e) { +- //stderr.writeLine("Error: " ~ e.toString()); ++ //derr.writeLine("Error: " ~ e.toString()); + //if (e.next) + // error(e.next); + throw new Exception("Error: " ~ e.toString() ~ "\0"); +--- a/src/abagames/util/Rand.d ++++ b/src/abagames/util/Rand.d +@@ -5,8 +5,8 @@ + */ + module abagames.util.Rand; + +-import random; +-import date; ++import std.random; ++import std.date; + + /** + * Random number generator. +@@ -19,14 +19,14 @@ + } + + public int nextInt(int n) { +- return random.rand() % n; ++ return rand() % n; + } + + public int nextSignedInt(int n) { +- return random.rand() % (n * 2) - n; ++ return rand() % (n * 2) - n; + } + + public float nextFloat(float n) { +- return ((float)(random.rand() % (n * 10000))) / 10000; ++ return (cast(float)(rand() % (n * 10000))) / 10000; + } + } +--- a/src/abagames/util/sdl/Input.d ++++ b/src/abagames/util/sdl/Input.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.sdl.Input; + +-import string; ++import string = std.string; + import SDL; + import abagames.util.sdl.SDLInitFailedException; + +--- a/src/abagames/util/sdl/MainLoop.d ++++ b/src/abagames/util/sdl/MainLoop.d +@@ -5,8 +5,7 @@ + */ + module abagames.util.sdl.MainLoop; + +-import string; +-import c.stdlib; ++import std.c.stdlib; + import SDL; + import abagames.util.Logger; + import abagames.util.Rand; +@@ -88,7 +87,7 @@ + done = 1; + + nowTick = SDL_GetTicks(); +- frame = (int) (nowTick-prvTickCount) / interval; ++ frame = cast(int) (nowTick-prvTickCount) / interval; + if (frame <= 0) { + frame = 1; + SDL_Delay(prvTickCount+interval-nowTick); +--- a/src/abagames/util/sdl/Screen3D.d ++++ b/src/abagames/util/sdl/Screen3D.d +@@ -5,8 +5,8 @@ + */ + module abagames.util.sdl.Screen3D; + +-import string; +-import c.stdlib; ++import string = std.string; ++import std.c.stdlib; + import SDL; + import opengl; + import abagames.util.Logger; +@@ -64,11 +64,11 @@ + glViewport(0, 0, width, height); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); +- //gluPerspective(45.0f, (GLfloat)width/(GLfloat)height, nearPlane, farPlane); ++ //gluPerspective(45.0f, cast(GLfloat)width/cast(GLfloat)height, nearPlane, farPlane); + glFrustum(-nearPlane, + nearPlane, +- -nearPlane * (GLfloat)height / (GLfloat)width, +- nearPlane * (GLfloat)height / (GLfloat)width, ++ -nearPlane * cast(GLfloat)height / cast(GLfloat)width, ++ nearPlane * cast(GLfloat)height / cast(GLfloat)width, + 0.1f, farPlane); + glMatrixMode(GL_MODELVIEW); + } +--- a/src/abagames/util/sdl/Sound.d ++++ b/src/abagames/util/sdl/Sound.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.sdl.Sound; + +-import string; ++import string = std.string; + import SDL; + import SDL_mixer; + import abagames.util.sdl.SDLInitFailedException; +--- a/src/abagames/util/sdl/Texture.d ++++ b/src/abagames/util/sdl/Texture.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.sdl.Texture; + +-import string; ++import string = std.string; + import opengl; + import SDL; + import abagames.util.sdl.SDLInitFailedException; +--- a/src/abagames/util/Vector.d ++++ b/src/abagames/util/Vector.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.Vector; + +-import math; ++import std.math; + + /** + * Vector. +@@ -60,19 +60,19 @@ + } + + public int checkSide(Vector pos1, Vector pos2) { +- int xo = pos2.x - pos1.x; +- int yo = pos2.y - pos1.y; ++ int xo = cast(int)(pos2.x - pos1.x); ++ int yo = cast(int)(pos2.y - pos1.y); + if (xo == 0) { + if (yo == 0) + return 0; +- return x - pos1.x; ++ return cast(int)(x - pos1.x); + } else if (yo == 0) { +- return pos1.y - y; ++ return cast(int)(pos1.y - y); + } else { + if (xo * yo > 0) { +- return (x - pos1.x) / xo - (y - pos1.y) / yo; ++ return cast(int)((x - pos1.x) / xo - (y - pos1.y) / yo); + } else { +- return -(x - pos1.x) / xo + (y - pos1.y) / yo; ++ return cast(int)(-(x - pos1.x) / xo + (y - pos1.y) / yo); + } + } + } diff -Nru a7xpg-0.11.dfsg1/debian/patches/dlang_v2.patch a7xpg-0.11.dfsg1/debian/patches/dlang_v2.patch --- a7xpg-0.11.dfsg1/debian/patches/dlang_v2.patch 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/dlang_v2.patch 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1,446 @@ +Description: port to D language version 2 + With this patch the code is accapted by gdc-4.6 0.29.1-4.6.4-3 without + triggering deprecated feature warnings/errors. +Author: Barry deFreese +Author: Peter De Wachter + +--- a/src/abagames/util/Rand.d ++++ b/src/abagames/util/Rand.d +@@ -6,27 +6,30 @@ + module abagames.util.Rand; + + import std.random; +-import std.date; ++import std.datetime; + + /** + * Random number generator. + */ + public class Rand { ++ private Random rand; + + public this() { +- d_time timer = getUTCtime(); +- rand_seed(timer, 0); ++ rand.seed(unpredictableSeed); + } + + public int nextInt(int n) { +- return rand() % n; ++ rand.popFront(); ++ return rand.front() % n; + } + + public int nextSignedInt(int n) { +- return rand() % (n * 2) - n; ++ rand.popFront(); ++ return rand.front() % (n * 2) - n; + } + + public float nextFloat(float n) { +- return (cast(float)(rand() % (n * 10000))) / 10000; ++ rand.popFront(); ++ return (cast(float)(rand.front() % (n * 10000))) / 10000; + } + } +--- a/src/abagames/util/sdl/Sound.d ++++ b/src/abagames/util/sdl/Sound.d +@@ -5,7 +5,8 @@ + */ + module abagames.util.sdl.Sound; + +-import string = std.string; ++import std.conv; ++import std.string; + import SDL; + import SDL_mixer; + import abagames.util.sdl.SDLInitFailedException; +@@ -18,8 +19,8 @@ + public: + static bool noSound = false; + static int fadeOutSpeed = 1280; +- static char[] soundsDir = "/usr/share/games/a7xpg/sounds/"; +- static char[] chunksDir = "/usr/share/games/a7xpg/sounds/"; ++ static string soundsDir = "/usr/share/games/a7xpg/sounds/"; ++ static string chunksDir = "/usr/share/games/a7xpg/sounds/"; + + public static void init() { + if (noSound) return; +@@ -31,7 +32,7 @@ + + if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) { + noSound = 1; +- derr.writeLine("Unable to initialize SDL audio: " ~ string.toString(SDL_GetError())); ++ derr.writeLine("Unable to initialize SDL audio: " ~ to!string(SDL_GetError())); + } + + audio_rate = 44100; +@@ -40,7 +41,7 @@ + audio_buffers = 4096; + if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) < 0) { + noSound = 1; +- derr.writeLine("Couldn't open audio: " ~ string.toString(SDL_GetError())); ++ derr.writeLine("Couldn't open audio: " ~ to!string(SDL_GetError())); + } + Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels); + } +@@ -62,25 +63,25 @@ + + // Load a sound or a chunk. + +- public void loadSound(char[] name) { ++ public void loadSound(string name) { + if (noSound) return; +- char[] fileName = soundsDir ~ name; +- music = Mix_LoadMUS(string.toStringz(fileName)); ++ string fileName = soundsDir ~ name; ++ music = Mix_LoadMUS(toStringz(fileName)); + if (!music) { + noSound = true; + throw new SDLInitFailedException("Couldn't load: " ~ fileName ~ +- " (" ~ string.toString(Mix_GetError()) ~ ")"); ++ " (" ~ to!string(Mix_GetError()) ~ ")"); + } + } + +- public void loadChunk(char[] name, int ch) { ++ public void loadChunk(string name, int ch) { + if (noSound) return; +- char[] fileName = chunksDir ~ name; +- chunk = Mix_LoadWAV(string.toStringz(fileName)); ++ string fileName = chunksDir ~ name; ++ chunk = Mix_LoadWAV(toStringz(fileName)); + if (!chunk) { + noSound = true; + throw new SDLInitFailedException("Couldn't load: " ~ fileName ~ +- " (" ~ string.toString(Mix_GetError()) ~ ")"); ++ " (" ~ to!string(Mix_GetError()) ~ ")"); + } + chunkChannel = ch; + } +--- a/src/abagames/util/sdl/SDLInitFailedException.d ++++ b/src/abagames/util/sdl/SDLInitFailedException.d +@@ -9,7 +9,7 @@ + * SDL initialize failed. + */ + public class SDLInitFailedException: Exception { +- public this(char[] msg) { ++ public this(string msg) { + super(msg); + } + } +--- a/src/abagames/a7xpg/A7xBoot.d ++++ b/src/abagames/a7xpg/A7xBoot.d +@@ -5,6 +5,7 @@ + */ + module abagames.a7xpg.A7xBoot; + ++import std.conv; + import std.string; + import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE; + import abagames.a7xpg.A7xScreen; +@@ -30,7 +31,7 @@ + ("Usage: a7xpg [-brightness [0-100]] [-luminous [0-100]] [-nosound] [-window] [-fullscreen] [-lowres]"); + } + +-private void parseArgs(char[][] args) { ++private void parseArgs(string[] args) { + for (int i = 1; i < args.length; i++) { + switch (args[i]) { + case "-brightness": +@@ -39,7 +40,7 @@ + exit(EXIT_FAILURE); + } + i++; +- float b = cast(float) atoi(args[i]) / 100; ++ float b = to!float(args[i]) / 100; + if (b < 0 || b > 1) { + usage(); + exit(EXIT_FAILURE); +@@ -52,7 +53,7 @@ + exit(EXIT_FAILURE); + } + i++; +- float l = cast(float) atoi(args[i]) / 100; ++ float l = to!float(args[i]) / 100; + if (l < 0 || l > 1) { + usage(); + exit(EXIT_FAILURE); +@@ -81,7 +82,7 @@ + } + } + +-public int main(char[][] args) { ++public int main(string[] args) { + screen = new A7xScreen; + input = new Input; + try { +--- a/src/abagames/a7xpg/A7xGameManager.d ++++ b/src/abagames/a7xpg/A7xGameManager.d +@@ -126,18 +126,18 @@ + ship = new Ship; + ship.init(input, field, this); + Gold.createDisplayLists(); +- auto Gold goldClass = new Gold; +- auto GoldInitializer gi = new GoldInitializer(ship, field, rand, this); ++ scope Gold goldClass = new Gold; ++ scope GoldInitializer gi = new GoldInitializer(ship, field, rand, this); + golds = new LuminousActorPool(16, goldClass, gi); + Enemy.createDisplayLists(); +- auto Enemy enemyClass = new Enemy; +- auto EnemyInitializer ei = new EnemyInitializer(ship, field, rand, this); ++ scope Enemy enemyClass = new Enemy; ++ scope EnemyInitializer ei = new EnemyInitializer(ship, field, rand, this); + enemies = new LuminousActorPool(ENEMY_MAX, enemyClass, ei); +- auto Particle particleClass = new Particle; +- auto ParticleInitializer pi = new ParticleInitializer(field, rand); ++ scope Particle particleClass = new Particle; ++ scope ParticleInitializer pi = new ParticleInitializer(field, rand); + particles = new LuminousActorPool(256, particleClass, pi); +- auto Bonus bonusClass = new Bonus; +- auto BonusInitializer bi = new BonusInitializer(); ++ scope Bonus bonusClass = new Bonus; ++ scope BonusInitializer bi = new BonusInitializer(); + bonuses = new ActorPool(8, bonusClass, bi); + LetterRender.createDisplayLists(); + for (int i = 0; i < bgm.length; i++) +--- a/src/abagames/a7xpg/A7xPrefManager.d ++++ b/src/abagames/a7xpg/A7xPrefManager.d +@@ -8,6 +8,7 @@ + import std.stream; + import std.c.stdlib; + import std.string; ++import std.conv; + import abagames.util.PrefManager; + + /** +@@ -16,22 +17,22 @@ + public class A7xPrefManager: PrefManager { + public: + static const int VERSION_NUM = 10; +- static const char[] PREF_FILE = ".a7xpg.prf"; ++ static const string PREF_FILE = ".a7xpg.prf"; + int hiScore; + + private void init() { + hiScore = 0; + } + +- public char[] pref_file() { ++ public string pref_file() { + char * home = getenv("HOME"); + if (home is null) + throw new Error("HOME environment variable is not defined"); +- return std.string.toString(home) ~ "/" ~ PREF_FILE; ++ return to!string(home) ~ "/" ~ PREF_FILE; + } + +- public void load() { +- auto File fd = new File; ++ public override void load() { ++ scope File fd = new File; + try { + int ver; + fd.open(pref_file()); +@@ -46,8 +47,8 @@ + } + } + +- public void save() { +- auto File fd = new File; ++ public override void save() { ++ scope File fd = new File; + fd.create(pref_file()); + fd.write(VERSION_NUM); + fd.write(hiScore); +--- a/src/abagames/a7xpg/A7xScreen.d ++++ b/src/abagames/a7xpg/A7xScreen.d +@@ -14,7 +14,7 @@ + */ + public class A7xScreen: Screen3D { + public: +- static const char[] CAPTION = "A7Xpg"; ++ static const string CAPTION = "A7Xpg"; + static float brightness = 1; + static float luminous = 0.5; + +--- a/src/abagames/a7xpg/LetterRender.d ++++ b/src/abagames/a7xpg/LetterRender.d +@@ -31,7 +31,7 @@ + glPopMatrix(); + } + +- public static void drawString(char[] str, float lx, float y, float s) { ++ public static void drawString(string str, float lx, float y, float s) { + float x = lx; + int c; + int idx; +--- a/src/abagames/util/ActorPool.d ++++ b/src/abagames/util/ActorPool.d +@@ -14,7 +14,7 @@ + public: + Actor[] actor; + protected: +- int actorIdx; ++ ptrdiff_t actorIdx; + + public this(int n, Actor act, ActorInitializer ini) { + actor = new Actor[n]; +--- a/src/abagames/util/Logger.d ++++ b/src/abagames/util/Logger.d +@@ -11,11 +11,11 @@ + * Logger(error/info). + */ + public class Logger { +- public static void info(char[] msg) { ++ public static void info(string msg) { + derr.writeLine("Info: " ~ msg); + } + +- public static void error(char[] msg) { ++ public static void error(string msg) { + //derr.writeLine("Error: " ~ msg); + throw new Exception("Error: " ~ msg ~ "\0"); + } +--- a/src/abagames/util/sdl/Input.d ++++ b/src/abagames/util/sdl/Input.d +@@ -5,7 +5,8 @@ + */ + module abagames.util.sdl.Input; + +-import string = std.string; ++import std.conv; ++import std.string; + import SDL; + import abagames.util.sdl.SDLInitFailedException; + +@@ -30,7 +31,7 @@ + public void openJoystick() { + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) { + throw new SDLInitFailedException( +- "Unable to init SDL joystick: " ~ string.toString(SDL_GetError())); ++ "Unable to init SDL joystick: " ~ to!string(SDL_GetError())); + } + stick = SDL_JoystickOpen(0); + } +--- a/src/abagames/util/sdl/MainLoop.d ++++ b/src/abagames/util/sdl/MainLoop.d +@@ -90,7 +90,7 @@ + frame = cast(int) (nowTick-prvTickCount) / interval; + if (frame <= 0) { + frame = 1; +- SDL_Delay(prvTickCount+interval-nowTick); ++ SDL_Delay(cast(uint) (prvTickCount+interval-nowTick)); + if (accframe) { + prvTickCount = SDL_GetTicks(); + } else { +--- a/src/abagames/util/sdl/Screen3D.d ++++ b/src/abagames/util/sdl/Screen3D.d +@@ -5,7 +5,8 @@ + */ + module abagames.util.sdl.Screen3D; + +-import string = std.string; ++import std.conv; ++import std.string; + import std.c.stdlib; + import SDL; + import opengl; +@@ -31,7 +32,7 @@ + protected abstract void init(); + protected abstract void close(); + +- public void initSDL() { ++ public override void initSDL() { + if (lowres) { + width /= 2; + height /= 2; +@@ -39,7 +40,7 @@ + // Initialize SDL. + if (SDL_Init(SDL_INIT_VIDEO) < 0) { + throw new SDLInitFailedException( +- "Unable to initialize SDL: " ~ string.toString(SDL_GetError())); ++ "Unable to initialize SDL: " ~ to!string(SDL_GetError())); + } + // Create an OpenGL screen. + if (windowMode) { +@@ -49,7 +50,7 @@ + } + if (SDL_SetVideoMode(width, height, 0, videoFlags) == null) { + throw new SDLInitFailedException +- ("Unable to create SDL screen: " ~ string.toString(SDL_GetError())); ++ ("Unable to create SDL screen: " ~ to!string(SDL_GetError())); + } + glViewport(0, 0, width, height); + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); +@@ -63,7 +64,7 @@ + public void screenResized() { + if (SDL_SetVideoMode(width, height, 0, videoFlags) == null) { + throw new Exception +- ("Unable to resize SDL screen: " ~ std.string.toString(SDL_GetError())); ++ ("Unable to resize SDL screen: " ~ to!string(SDL_GetError())); + } + + glViewport(0, 0, width, height); +@@ -83,17 +84,17 @@ + screenResized(); + } + +- public void closeSDL() { ++ public override void closeSDL() { + close(); + SDL_ShowCursor(SDL_ENABLE); + } + +- public void flip() { ++ public override void flip() { + handleError(); + SDL_GL_SwapBuffers(); + } + +- public void clear() { ++ public override void clear() { + glClear(GL_COLOR_BUFFER_BIT); + } + +@@ -105,7 +106,7 @@ + exit(EXIT_FAILURE); + } + +- protected void setCaption(char[] name) { +- SDL_WM_SetCaption(string.toStringz(name), null); ++ protected void setCaption(string name) { ++ SDL_WM_SetCaption(toStringz(name), null); + } + } +--- a/src/abagames/util/sdl/Texture.d ++++ b/src/abagames/util/sdl/Texture.d +@@ -5,7 +5,7 @@ + */ + module abagames.util.sdl.Texture; + +-import string = std.string; ++import std.string; + import opengl; + import SDL; + import abagames.util.sdl.SDLInitFailedException; +@@ -15,15 +15,15 @@ + */ + public class Texture { + public: +- static char[] imagesDir = "/usr/share/games/a7xpg/images/"; ++ static string imagesDir = "/usr/share/games/a7xpg/images/"; + + private: + GLuint num; + +- public this(char[] name) { +- char[] fileName = imagesDir ~ name; ++ public this(string name) { ++ string fileName = imagesDir ~ name; + SDL_Surface *surface; +- surface = SDL_LoadBMP(string.toStringz(fileName)); ++ surface = SDL_LoadBMP(toStringz(fileName)); + if (!surface) { + throw new SDLInitFailedException("Unable to load: " ~ fileName); + } diff -Nru a7xpg-0.11.dfsg1/debian/patches/fixes.patch a7xpg-0.11.dfsg1/debian/patches/fixes.patch --- a7xpg-0.11.dfsg1/debian/patches/fixes.patch 2007-08-25 22:15:47.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1876 +0,0 @@ -# Copyright (C) 2007 Peter De Wachter -# Distributed under the same license as the game. See debian/copyright. - -Index: a7xpg-0.11.dfsg1/build.xml -=================================================================== ---- a7xpg-0.11.dfsg1.orig/build.xml 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/build.xml 2007-08-25 21:15:55.000000000 +0000 -@@ -2,11 +2,8 @@ - - - -- -- -- - -- -+ - - - -@@ -15,11 +12,11 @@ - - - -- -- -+ -+ - -- -- -+ -+ - - - -@@ -30,14 +27,14 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -45,7 +42,7 @@ - - - -- -+ - - - -@@ -59,12 +56,13 @@ - - - -- -- -+ -+ - - - - -+ - - - -Index: a7xpg-0.11.dfsg1/import/SDL.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL.d 2007-08-25 21:15:55.000000000 +0000 -@@ -20,18 +20,18 @@ - slouken@devolution.com - */ - --import SDL_types; --import SDL_getenv; --import SDL_error; --import SDL_rwops; --import SDL_timer; --import SDL_audio; --import SDL_cdrom; --import SDL_joystick; --import SDL_events; --import SDL_video; --import SDL_byteorder; --import SDL_version; -+public import SDL_types; -+public import SDL_getenv; -+public import SDL_error; -+public import SDL_rwops; -+public import SDL_timer; -+public import SDL_audio; -+public import SDL_cdrom; -+public import SDL_joystick; -+public import SDL_events; -+public import SDL_video; -+public import SDL_byteorder; -+public import SDL_version; - - extern(C): - -@@ -73,18 +73,18 @@ - */ - void SDL_Quit(); - --void SDL_SetModuleHandle(void *hInst); --extern(Windows) void* GetModuleHandle(char*); -+//void SDL_SetModuleHandle(void *hInst); -+//extern(Windows) void* GetModuleHandle(char*); - - static this() - { - /* Load SDL dynamic link library */ - if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0) - throw new Error("Error loading SDL"); -- SDL_SetModuleHandle(GetModuleHandle(null)); -+ //SDL_SetModuleHandle(GetModuleHandle(null)); - } - - static ~this() - { - SDL_Quit(); --} -\ No newline at end of file -+} -Index: a7xpg-0.11.dfsg1/import/SDL_active.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_active.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_active.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* Include file for SDL application focus event handling */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_audio.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_audio.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_audio.d 2007-08-25 21:15:55.000000000 +0000 -@@ -20,10 +20,10 @@ - slouken@devolution.com - */ - --import SDL_types; --import SDL_error; --import SDL_rwops; --import SDL_byteorder; -+public import SDL_types; -+public import SDL_error; -+public import SDL_rwops; -+public import SDL_byteorder; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_cdrom.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_cdrom.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_cdrom.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* This is the CD-audio control API for Simple DirectMedia Layer */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_endian.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_endian.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_endian.d 2007-08-25 21:15:55.000000000 +0000 -@@ -34,9 +34,9 @@ - and other data sources. - */ - --import SDL_types; --import SDL_rwops; --import SDL_byteorder; -+public import SDL_types; -+public import SDL_rwops; -+public import SDL_byteorder; - - extern(C): - -@@ -57,9 +57,9 @@ - Uint64 SDL_Swap64(Uint64 val) { - Uint32 hi, lo; - /* Separate into high and low 32-bit values and swap them */ -- lo = (Uint32)(val&0xFFFFFFFF); -+ lo = cast(Uint32)(val&0xFFFFFFFF); - val >>= 32; -- hi = (Uint32)(val&0xFFFFFFFF); -+ hi = cast(Uint32)(val&0xFFFFFFFF); - val = SDL_Swap32(lo); - val <<= 32; - val |= SDL_Swap32(hi); -Index: a7xpg-0.11.dfsg1/import/SDL_events.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_events.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_events.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,12 +22,12 @@ - - /* Include file for SDL event handling */ - --import SDL_types; --import SDL_active; --import SDL_keyboard; --import SDL_mouse; --import SDL_joystick; --import SDL_syswm; -+public import SDL_types; -+public import SDL_active; -+public import SDL_keyboard; -+public import SDL_mouse; -+public import SDL_joystick; -+public import SDL_syswm; - - extern(C): - -@@ -105,7 +105,7 @@ - Uint8 type; /* SDL_KEYDOWN or SDL_KEYUP */ - Uint8 which; /* The keyboard device index */ - Uint8 state; /* SDL_PRESSED or SDL_RELEASED */ -- SDL_keysym keysym; -+ SDL__keysym keysym; - } - - /* Mouse motion event structure */ -Index: a7xpg-0.11.dfsg1/import/SDL_getenv.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_getenv.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_getenv.d 2007-08-25 21:15:55.000000000 +0000 -@@ -1,11 +1,2 @@ - /* Not all environments have a working getenv()/putenv() */ -- --extern(C): -- --/* Put a variable of the form "name=value" into the environment */ --int SDL_putenv(char *variable); --int putenv(char* X) { return SDL_putenv(X); } -- --/* Retrieve a variable named "name" from the environment */ --char *SDL_getenv(char *name); --char *getenv(char* X) { return SDL_getenv(X); } -+/* But Linux has */ -Index: a7xpg-0.11.dfsg1/import/SDL_joystick.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_joystick.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_joystick.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* Include file for SDL joystick event handling */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_keyboard.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_keyboard.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_keyboard.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,11 +22,12 @@ - - /* Include file for SDL keyboard event handling */ - --import SDL_types; -+public import SDL_types; - // !!! A hack! struct SDL_keysym is defined in this module, - // !!! so we need to resolve the nameclash... - // !!! Definitely won't work on *NIX but for now will do. --import SDL_Keysym; -+// pdewacht@gmail.com: resolved this by renaming struct SDL_keysym to SDL__keysym -+public import SDL_keysym; - - extern(C): - -@@ -46,7 +47,7 @@ - An international character.. - } - */ --struct SDL_keysym { -+struct SDL__keysym { - Uint8 scancode; /* hardware specific scancode */ - SDLKey sym; /* SDL virtual keysym */ - SDLMod mod; /* current key modifiers */ -Index: a7xpg-0.11.dfsg1/import/SDL_mixer.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_mixer.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_mixer.d 2007-08-25 21:15:55.000000000 +0000 -@@ -24,7 +24,7 @@ - - /* $Id: SDL_mixer.d,v 1.1.1.1 2003/09/19 14:55:49 kenta Exp $ */ - --import SDL; -+public import SDL; - - extern (C) { - -Index: a7xpg-0.11.dfsg1/import/SDL_mouse.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_mouse.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_mouse.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,8 +22,8 @@ - - /* Include file for SDL mouse event handling */ - --import SDL_types; --import SDL_video; -+public import SDL_types; -+public import SDL_video; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_mutex.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_mutex.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_mutex.d 2007-08-25 21:15:55.000000000 +0000 -@@ -25,7 +25,7 @@ - These are independent of the other SDL routines. - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_quit.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_quit.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_quit.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* Include file for SDL quit event handling */ - --import SDL_events; -+public import SDL_events; - - /* - An SDL_QUITEVENT is generated when the user tries to close the application -@@ -43,5 +43,5 @@ - bit SDL_QuitRequested() - { - SDL_PumpEvents(); -- return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK); -+ return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK) != 0; - } -Index: a7xpg-0.11.dfsg1/import/SDL_rwops.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_rwops.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_rwops.d 2007-08-25 21:15:55.000000000 +0000 -@@ -24,7 +24,7 @@ - data sources. It can easily be extended to files, memory, etc. - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -@@ -84,35 +84,25 @@ - /* Macros to easily read and write from an SDL_RWops structure */ - int SDL_RWseek(SDL_RWops *ctx, int offset, int whence) - { -- int (*seek)(SDL_RWops *context, int offset, int whence); -- seek = ctx.seek; -- return (*seek)(ctx, offset, whence); -+ return ctx.seek(ctx, offset, whence); - } - - int SDL_RWtell(SDL_RWops *ctx) - { -- int (*seek)(SDL_RWops *context, int offset, int whence); -- seek = ctx.seek; -- return (*seek)(ctx, 0, 1); -+ return ctx.seek(ctx, 0, 1); - } - - int SDL_RWread(SDL_RWops *ctx, void* ptr, int size, int n) - { -- int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); -- read = ctx.read; -- return (*read)(ctx, ptr, size, n); -+ return ctx.read(ctx, ptr, size, n); - } - - int SDL_RWwrite(SDL_RWops *ctx, void* ptr, int size, int n) - { -- int (*write)(SDL_RWops *context, void *ptr, int size, int num); -- write = ctx.write; -- return (*write)(ctx, ptr, size, n); -+ return ctx.write(ctx, ptr, size, n); - } - - int SDL_RWclose(SDL_RWops *ctx) - { -- int (*close)(SDL_RWops *context); -- close = ctx.close; -- return (*close)(ctx); -+ return ctx.close(ctx); - } -Index: a7xpg-0.11.dfsg1/import/SDL_syswm.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_syswm.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_syswm.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* Include file for SDL custom system window manager hooks */ - --import SDL_version; -+public import SDL_version; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_thread.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_thread.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_thread.d 2007-08-25 21:15:55.000000000 +0000 -@@ -25,8 +25,8 @@ - These are independent of the other SDL routines. - */ - --import SDL_types; --import SDL_mutex; -+public import SDL_types; -+public import SDL_mutex; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_timer.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_timer.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_timer.d 2007-08-25 21:15:55.000000000 +0000 -@@ -20,7 +20,7 @@ - slouken@devolution.com - */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_version.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_version.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_version.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,7 +22,7 @@ - - /* This header defines the current SDL version */ - --import SDL_types; -+public import SDL_types; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/SDL_video.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/SDL_video.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/SDL_video.d 2007-08-25 21:15:55.000000000 +0000 -@@ -22,9 +22,9 @@ - - /* Header file for access to the SDL raw framebuffer window */ - --import SDL_types; --import SDL_mutex; --import SDL_rwops; -+public import SDL_types; -+public import SDL_mutex; -+public import SDL_rwops; - - extern(C): - -Index: a7xpg-0.11.dfsg1/import/opengl.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/import/opengl.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/import/opengl.d 2007-08-25 21:15:55.000000000 +0000 -@@ -1,6 +1,8 @@ --import windows; -- --extern(Windows): -+version(Windows) { -+ extern(Windows): -+} else { -+ extern(C): -+} - - alias uint GLenum; - alias ubyte GLboolean; -@@ -1111,345 +1113,343 @@ - - /*************************************************************/ - --extern(Windows) void /*APIENTRY*/glAccum (GLenum op, GLfloat value); --extern(Windows) void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref); --extern(Windows) GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); --extern(Windows) void /*APIENTRY*/glArrayElement (GLint i); --extern(Windows) void /*APIENTRY*/glBegin (GLenum mode); --extern(Windows) void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); --extern(Windows) void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); --extern(Windows) void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); --extern(Windows) void /*APIENTRY*/glCallList (GLuint list); --extern(Windows) void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); --extern(Windows) void /*APIENTRY*/glClear (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); --extern(Windows) void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); --extern(Windows) void /*APIENTRY*/glClearDepth (GLclampd depth); --extern(Windows) void /*APIENTRY*/glClearIndex (GLfloat c); --extern(Windows) void /*APIENTRY*/glClearStencil (GLint s); --extern(Windows) void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); --extern(Windows) void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); --extern(Windows) void /*APIENTRY*/glColor3bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); --extern(Windows) void /*APIENTRY*/glColor3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); --extern(Windows) void /*APIENTRY*/glColor3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); --extern(Windows) void /*APIENTRY*/glColor3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); --extern(Windows) void /*APIENTRY*/glColor3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); --extern(Windows) void /*APIENTRY*/glColor3ubv (GLubyte *v); --extern(Windows) void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); --extern(Windows) void /*APIENTRY*/glColor3uiv (GLuint *v); --extern(Windows) void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); --extern(Windows) void /*APIENTRY*/glColor3usv (GLushort *v); --extern(Windows) void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); --extern(Windows) void /*APIENTRY*/glColor4bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); --extern(Windows) void /*APIENTRY*/glColor4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); --extern(Windows) void /*APIENTRY*/glColor4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); --extern(Windows) void /*APIENTRY*/glColor4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); --extern(Windows) void /*APIENTRY*/glColor4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); --extern(Windows) void /*APIENTRY*/glColor4ubv (GLubyte *v); --extern(Windows) void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); --extern(Windows) void /*APIENTRY*/glColor4uiv (GLuint *v); --extern(Windows) void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); --extern(Windows) void /*APIENTRY*/glColor4usv (GLushort *v); --extern(Windows) void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); --extern(Windows) void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); --extern(Windows) void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); --extern(Windows) void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); --extern(Windows) void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); --extern(Windows) void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); --extern(Windows) void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); --extern(Windows) void /*APIENTRY*/glCullFace (GLenum mode); --extern(Windows) void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); --extern(Windows) void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); --extern(Windows) void /*APIENTRY*/glDepthFunc (GLenum func); --extern(Windows) void /*APIENTRY*/glDepthMask (GLboolean flag); --extern(Windows) void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); --extern(Windows) void /*APIENTRY*/glDisable (GLenum cap); --extern(Windows) void /*APIENTRY*/glDisableClientState (GLenum array); --extern(Windows) void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); --extern(Windows) void /*APIENTRY*/glDrawBuffer (GLenum mode); --extern(Windows) void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); --extern(Windows) void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glEdgeFlag (GLboolean flag); --extern(Windows) void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); --extern(Windows) void /*APIENTRY*/glEnable (GLenum cap); --extern(Windows) void /*APIENTRY*/glEnableClientState (GLenum array); --extern(Windows) void /*APIENTRY*/glEnd (); --extern(Windows) void /*APIENTRY*/glEndList (); --extern(Windows) void /*APIENTRY*/glEvalCoord1d (GLdouble u); --extern(Windows) void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); --extern(Windows) void /*APIENTRY*/glEvalCoord1f (GLfloat u); --extern(Windows) void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); --extern(Windows) void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); --extern(Windows) void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); --extern(Windows) void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); --extern(Windows) void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); --extern(Windows) void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); --extern(Windows) void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); --extern(Windows) void /*APIENTRY*/glEvalPoint1 (GLint i); --extern(Windows) void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); --extern(Windows) void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); --extern(Windows) void /*APIENTRY*/glFinish (); --extern(Windows) void /*APIENTRY*/glFlush (); --extern(Windows) void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glFogi (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glFrontFace (GLenum mode); --extern(Windows) void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); --extern(Windows) GLuint /*APIENTRY*/glGenLists (GLsizei range); --extern(Windows) void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); --extern(Windows) void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); --extern(Windows) void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); --extern(Windows) void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); --extern(Windows) GLenum /*APIENTRY*/glGetError (); --extern(Windows) void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); --extern(Windows) void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); --extern(Windows) void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); --extern(Windows) void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); --extern(Windows) void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); --extern(Windows) void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); --extern(Windows) void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); --extern(Windows) void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); --extern(Windows) GLubyte * /*APIENTRY*/glGetString (GLenum name); --extern(Windows) void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); --extern(Windows) void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glHint (GLenum target, GLenum mode); --extern(Windows) void /*APIENTRY*/glIndexMask (GLuint mask); --extern(Windows) void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glIndexd (GLdouble c); --extern(Windows) void /*APIENTRY*/glIndexdv (GLdouble *c); --extern(Windows) void /*APIENTRY*/glIndexf (GLfloat c); --extern(Windows) void /*APIENTRY*/glIndexfv (GLfloat *c); --extern(Windows) void /*APIENTRY*/glIndexi (GLint c); --extern(Windows) void /*APIENTRY*/glIndexiv (GLint *c); --extern(Windows) void /*APIENTRY*/glIndexs (GLshort c); --extern(Windows) void /*APIENTRY*/glIndexsv (GLshort *c); --extern(Windows) void /*APIENTRY*/glIndexub (GLubyte c); --extern(Windows) void /*APIENTRY*/glIndexubv (GLubyte *c); --extern(Windows) void /*APIENTRY*/glInitNames (); --extern(Windows) void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); --extern(Windows) GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); --extern(Windows) GLboolean /*APIENTRY*/glIsList (GLuint list); --extern(Windows) GLboolean /*APIENTRY*/glIsTexture (GLuint texture); --extern(Windows) void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); --extern(Windows) void /*APIENTRY*/glLineWidth (GLfloat width); --extern(Windows) void /*APIENTRY*/glListBase (GLuint base); --extern(Windows) void /*APIENTRY*/glLoadIdentity (); --extern(Windows) void /*APIENTRY*/glLoadMatrixd (GLdouble *m); --extern(Windows) void /*APIENTRY*/glLoadMatrixf (GLfloat *m); --extern(Windows) void /*APIENTRY*/glLoadName (GLuint name); --extern(Windows) void /*APIENTRY*/glLogicOp (GLenum opcode); --extern(Windows) void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); --extern(Windows) void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); --extern(Windows) void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); --extern(Windows) void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); --extern(Windows) void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); --extern(Windows) void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); --extern(Windows) void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); --extern(Windows) void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); --extern(Windows) void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glMatrixMode (GLenum mode); --extern(Windows) void /*APIENTRY*/glMultMatrixd (GLdouble *m); --extern(Windows) void /*APIENTRY*/glMultMatrixf (GLfloat *m); --extern(Windows) void /*APIENTRY*/glNewList (GLuint list, GLenum mode); --extern(Windows) void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); --extern(Windows) void /*APIENTRY*/glNormal3bv (GLbyte *v); --extern(Windows) void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); --extern(Windows) void /*APIENTRY*/glNormal3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); --extern(Windows) void /*APIENTRY*/glNormal3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); --extern(Windows) void /*APIENTRY*/glNormal3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); --extern(Windows) void /*APIENTRY*/glNormal3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); --extern(Windows) void /*APIENTRY*/glPassThrough (GLfloat token); --extern(Windows) void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); --extern(Windows) void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); --extern(Windows) void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); --extern(Windows) void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); --extern(Windows) void /*APIENTRY*/glPointSize (GLfloat size); --extern(Windows) void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); --extern(Windows) void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); --extern(Windows) void /*APIENTRY*/glPolygonStipple (GLubyte *mask); --extern(Windows) void /*APIENTRY*/glPopAttrib (); --extern(Windows) void /*APIENTRY*/glPopClientAttrib (); --extern(Windows) void /*APIENTRY*/glPopMatrix (); --extern(Windows) void /*APIENTRY*/glPopName (); --extern(Windows) void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); --extern(Windows) void /*APIENTRY*/glPushAttrib (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); --extern(Windows) void /*APIENTRY*/glPushMatrix (); --extern(Windows) void /*APIENTRY*/glPushName (GLuint name); --extern(Windows) void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); --extern(Windows) void /*APIENTRY*/glRasterPos2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); --extern(Windows) void /*APIENTRY*/glRasterPos2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); --extern(Windows) void /*APIENTRY*/glRasterPos2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); --extern(Windows) void /*APIENTRY*/glRasterPos2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glRasterPos3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glRasterPos3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); --extern(Windows) void /*APIENTRY*/glRasterPos3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); --extern(Windows) void /*APIENTRY*/glRasterPos3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); --extern(Windows) void /*APIENTRY*/glRasterPos4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); --extern(Windows) void /*APIENTRY*/glRasterPos4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); --extern(Windows) void /*APIENTRY*/glRasterPos4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); --extern(Windows) void /*APIENTRY*/glRasterPos4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glReadBuffer (GLenum mode); --extern(Windows) void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); --extern(Windows) void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); --extern(Windows) void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); --extern(Windows) void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); --extern(Windows) void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); --extern(Windows) void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); --extern(Windows) void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); --extern(Windows) void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); --extern(Windows) GLint /*APIENTRY*/glRenderMode (GLenum mode); --extern(Windows) void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); --extern(Windows) void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); --extern(Windows) void /*APIENTRY*/glShadeModel (GLenum mode); --extern(Windows) void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask); --extern(Windows) void /*APIENTRY*/glStencilMask (GLuint mask); --extern(Windows) void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); --extern(Windows) void /*APIENTRY*/glTexCoord1d (GLdouble s); --extern(Windows) void /*APIENTRY*/glTexCoord1dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord1f (GLfloat s); --extern(Windows) void /*APIENTRY*/glTexCoord1fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord1i (GLint s); --extern(Windows) void /*APIENTRY*/glTexCoord1iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord1s (GLshort s); --extern(Windows) void /*APIENTRY*/glTexCoord1sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); --extern(Windows) void /*APIENTRY*/glTexCoord2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); --extern(Windows) void /*APIENTRY*/glTexCoord2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); --extern(Windows) void /*APIENTRY*/glTexCoord2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); --extern(Windows) void /*APIENTRY*/glTexCoord2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); --extern(Windows) void /*APIENTRY*/glTexCoord3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); --extern(Windows) void /*APIENTRY*/glTexCoord3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); --extern(Windows) void /*APIENTRY*/glTexCoord3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); --extern(Windows) void /*APIENTRY*/glTexCoord3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); --extern(Windows) void /*APIENTRY*/glTexCoord4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); --extern(Windows) void /*APIENTRY*/glTexCoord4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); --extern(Windows) void /*APIENTRY*/glTexCoord4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); --extern(Windows) void /*APIENTRY*/glTexCoord4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); --extern(Windows) void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); --extern(Windows) void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); --extern(Windows) void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); --extern(Windows) void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); --extern(Windows) void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); --extern(Windows) void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); --extern(Windows) void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); --extern(Windows) void /*APIENTRY*/glVertex2dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); --extern(Windows) void /*APIENTRY*/glVertex2fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex2i (GLint x, GLint y); --extern(Windows) void /*APIENTRY*/glVertex2iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); --extern(Windows) void /*APIENTRY*/glVertex2sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); --extern(Windows) void /*APIENTRY*/glVertex3dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); --extern(Windows) void /*APIENTRY*/glVertex3fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); --extern(Windows) void /*APIENTRY*/glVertex3iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); --extern(Windows) void /*APIENTRY*/glVertex3sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); --extern(Windows) void /*APIENTRY*/glVertex4dv (GLdouble *v); --extern(Windows) void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); --extern(Windows) void /*APIENTRY*/glVertex4fv (GLfloat *v); --extern(Windows) void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); --extern(Windows) void /*APIENTRY*/glVertex4iv (GLint *v); --extern(Windows) void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); --extern(Windows) void /*APIENTRY*/glVertex4sv (GLshort *v); --extern(Windows) void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); --extern(Windows) void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); -- -+void /*APIENTRY*/glAccum (GLenum op, GLfloat value); -+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref); -+GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); -+void /*APIENTRY*/glArrayElement (GLint i); -+void /*APIENTRY*/glBegin (GLenum mode); -+void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); -+void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); -+void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); -+void /*APIENTRY*/glCallList (GLuint list); -+void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); -+void /*APIENTRY*/glClear (GLbitfield mask); -+void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -+void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -+void /*APIENTRY*/glClearDepth (GLclampd depth); -+void /*APIENTRY*/glClearIndex (GLfloat c); -+void /*APIENTRY*/glClearStencil (GLint s); -+void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); -+void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); -+void /*APIENTRY*/glColor3bv (GLbyte *v); -+void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); -+void /*APIENTRY*/glColor3dv (GLdouble *v); -+void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); -+void /*APIENTRY*/glColor3fv (GLfloat *v); -+void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); -+void /*APIENTRY*/glColor3iv (GLint *v); -+void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); -+void /*APIENTRY*/glColor3sv (GLshort *v); -+void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); -+void /*APIENTRY*/glColor3ubv (GLubyte *v); -+void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); -+void /*APIENTRY*/glColor3uiv (GLuint *v); -+void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); -+void /*APIENTRY*/glColor3usv (GLushort *v); -+void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); -+void /*APIENTRY*/glColor4bv (GLbyte *v); -+void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); -+void /*APIENTRY*/glColor4dv (GLdouble *v); -+void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -+void /*APIENTRY*/glColor4fv (GLfloat *v); -+void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); -+void /*APIENTRY*/glColor4iv (GLint *v); -+void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); -+void /*APIENTRY*/glColor4sv (GLshort *v); -+void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -+void /*APIENTRY*/glColor4ubv (GLubyte *v); -+void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); -+void /*APIENTRY*/glColor4uiv (GLuint *v); -+void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); -+void /*APIENTRY*/glColor4usv (GLushort *v); -+void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -+void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); -+void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); -+void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); -+void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -+void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -+void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -+void /*APIENTRY*/glCullFace (GLenum mode); -+void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); -+void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); -+void /*APIENTRY*/glDepthFunc (GLenum func); -+void /*APIENTRY*/glDepthMask (GLboolean flag); -+void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); -+void /*APIENTRY*/glDisable (GLenum cap); -+void /*APIENTRY*/glDisableClientState (GLenum array); -+void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); -+void /*APIENTRY*/glDrawBuffer (GLenum mode); -+void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); -+void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glEdgeFlag (GLboolean flag); -+void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); -+void /*APIENTRY*/glEnable (GLenum cap); -+void /*APIENTRY*/glEnableClientState (GLenum array); -+void /*APIENTRY*/glEnd (); -+void /*APIENTRY*/glEndList (); -+void /*APIENTRY*/glEvalCoord1d (GLdouble u); -+void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); -+void /*APIENTRY*/glEvalCoord1f (GLfloat u); -+void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); -+void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); -+void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); -+void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); -+void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); -+void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); -+void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); -+void /*APIENTRY*/glEvalPoint1 (GLint i); -+void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); -+void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); -+void /*APIENTRY*/glFinish (); -+void /*APIENTRY*/glFlush (); -+void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glFogi (GLenum pname, GLint param); -+void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); -+void /*APIENTRY*/glFrontFace (GLenum mode); -+void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -+GLuint /*APIENTRY*/glGenLists (GLsizei range); -+void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); -+void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); -+void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); -+void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); -+GLenum /*APIENTRY*/glGetError (); -+void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); -+void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); -+void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); -+void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); -+void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); -+void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); -+void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); -+void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); -+void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); -+GLubyte * /*APIENTRY*/glGetString (GLenum name); -+void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); -+void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); -+void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glHint (GLenum target, GLenum mode); -+void /*APIENTRY*/glIndexMask (GLuint mask); -+void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glIndexd (GLdouble c); -+void /*APIENTRY*/glIndexdv (GLdouble *c); -+void /*APIENTRY*/glIndexf (GLfloat c); -+void /*APIENTRY*/glIndexfv (GLfloat *c); -+void /*APIENTRY*/glIndexi (GLint c); -+void /*APIENTRY*/glIndexiv (GLint *c); -+void /*APIENTRY*/glIndexs (GLshort c); -+void /*APIENTRY*/glIndexsv (GLshort *c); -+void /*APIENTRY*/glIndexub (GLubyte c); -+void /*APIENTRY*/glIndexubv (GLubyte *c); -+void /*APIENTRY*/glInitNames (); -+void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); -+GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); -+GLboolean /*APIENTRY*/glIsList (GLuint list); -+GLboolean /*APIENTRY*/glIsTexture (GLuint texture); -+void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); -+void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); -+void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); -+void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); -+void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); -+void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); -+void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); -+void /*APIENTRY*/glLineWidth (GLfloat width); -+void /*APIENTRY*/glListBase (GLuint base); -+void /*APIENTRY*/glLoadIdentity (); -+void /*APIENTRY*/glLoadMatrixd (GLdouble *m); -+void /*APIENTRY*/glLoadMatrixf (GLfloat *m); -+void /*APIENTRY*/glLoadName (GLuint name); -+void /*APIENTRY*/glLogicOp (GLenum opcode); -+void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); -+void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); -+void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); -+void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); -+void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); -+void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); -+void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); -+void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); -+void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); -+void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); -+void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); -+void /*APIENTRY*/glMatrixMode (GLenum mode); -+void /*APIENTRY*/glMultMatrixd (GLdouble *m); -+void /*APIENTRY*/glMultMatrixf (GLfloat *m); -+void /*APIENTRY*/glNewList (GLuint list, GLenum mode); -+void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); -+void /*APIENTRY*/glNormal3bv (GLbyte *v); -+void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); -+void /*APIENTRY*/glNormal3dv (GLdouble *v); -+void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); -+void /*APIENTRY*/glNormal3fv (GLfloat *v); -+void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); -+void /*APIENTRY*/glNormal3iv (GLint *v); -+void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); -+void /*APIENTRY*/glNormal3sv (GLshort *v); -+void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -+void /*APIENTRY*/glPassThrough (GLfloat token); -+void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); -+void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); -+void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); -+void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); -+void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); -+void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); -+void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); -+void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); -+void /*APIENTRY*/glPointSize (GLfloat size); -+void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); -+void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); -+void /*APIENTRY*/glPolygonStipple (GLubyte *mask); -+void /*APIENTRY*/glPopAttrib (); -+void /*APIENTRY*/glPopClientAttrib (); -+void /*APIENTRY*/glPopMatrix (); -+void /*APIENTRY*/glPopName (); -+void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); -+void /*APIENTRY*/glPushAttrib (GLbitfield mask); -+void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); -+void /*APIENTRY*/glPushMatrix (); -+void /*APIENTRY*/glPushName (GLuint name); -+void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); -+void /*APIENTRY*/glRasterPos2dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); -+void /*APIENTRY*/glRasterPos2fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); -+void /*APIENTRY*/glRasterPos2iv (GLint *v); -+void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); -+void /*APIENTRY*/glRasterPos2sv (GLshort *v); -+void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glRasterPos3dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glRasterPos3fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); -+void /*APIENTRY*/glRasterPos3iv (GLint *v); -+void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); -+void /*APIENTRY*/glRasterPos3sv (GLshort *v); -+void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -+void /*APIENTRY*/glRasterPos4dv (GLdouble *v); -+void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -+void /*APIENTRY*/glRasterPos4fv (GLfloat *v); -+void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); -+void /*APIENTRY*/glRasterPos4iv (GLint *v); -+void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); -+void /*APIENTRY*/glRasterPos4sv (GLshort *v); -+void /*APIENTRY*/glReadBuffer (GLenum mode); -+void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); -+void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); -+void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); -+void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); -+void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); -+void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); -+void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); -+void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); -+GLint /*APIENTRY*/glRenderMode (GLenum mode); -+void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -+void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); -+void /*APIENTRY*/glShadeModel (GLenum mode); -+void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask); -+void /*APIENTRY*/glStencilMask (GLuint mask); -+void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -+void /*APIENTRY*/glTexCoord1d (GLdouble s); -+void /*APIENTRY*/glTexCoord1dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord1f (GLfloat s); -+void /*APIENTRY*/glTexCoord1fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord1i (GLint s); -+void /*APIENTRY*/glTexCoord1iv (GLint *v); -+void /*APIENTRY*/glTexCoord1s (GLshort s); -+void /*APIENTRY*/glTexCoord1sv (GLshort *v); -+void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); -+void /*APIENTRY*/glTexCoord2dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); -+void /*APIENTRY*/glTexCoord2fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); -+void /*APIENTRY*/glTexCoord2iv (GLint *v); -+void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); -+void /*APIENTRY*/glTexCoord2sv (GLshort *v); -+void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); -+void /*APIENTRY*/glTexCoord3dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); -+void /*APIENTRY*/glTexCoord3fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); -+void /*APIENTRY*/glTexCoord3iv (GLint *v); -+void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); -+void /*APIENTRY*/glTexCoord3sv (GLshort *v); -+void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); -+void /*APIENTRY*/glTexCoord4dv (GLdouble *v); -+void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); -+void /*APIENTRY*/glTexCoord4fv (GLfloat *v); -+void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); -+void /*APIENTRY*/glTexCoord4iv (GLint *v); -+void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); -+void /*APIENTRY*/glTexCoord4sv (GLshort *v); -+void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); -+void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); -+void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); -+void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); -+void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); -+void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -+void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); -+void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); -+void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); -+void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); -+void /*APIENTRY*/glVertex2dv (GLdouble *v); -+void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); -+void /*APIENTRY*/glVertex2fv (GLfloat *v); -+void /*APIENTRY*/glVertex2i (GLint x, GLint y); -+void /*APIENTRY*/glVertex2iv (GLint *v); -+void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); -+void /*APIENTRY*/glVertex2sv (GLshort *v); -+void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); -+void /*APIENTRY*/glVertex3dv (GLdouble *v); -+void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); -+void /*APIENTRY*/glVertex3fv (GLfloat *v); -+void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); -+void /*APIENTRY*/glVertex3iv (GLint *v); -+void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); -+void /*APIENTRY*/glVertex3sv (GLshort *v); -+void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -+void /*APIENTRY*/glVertex4dv (GLdouble *v); -+void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -+void /*APIENTRY*/glVertex4fv (GLfloat *v); -+void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); -+void /*APIENTRY*/glVertex4iv (GLint *v); -+void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); -+void /*APIENTRY*/glVertex4sv (GLshort *v); -+void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); -+void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - --extern(Windows): - - /* EXT_vertex_array */ - typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i); -@@ -1483,4 +1483,4 @@ - typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) - (GLenum target, GLenum pname, GLfloat *params); - --import openglu; -\ No newline at end of file -+import openglu; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xBoot.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xBoot.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,13 +5,15 @@ - */ - module abagames.a7xpg.A7xBoot; - --import string; -+import std.string; -+import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE; - import abagames.a7xpg.A7xScreen; - import abagames.a7xpg.A7xGameManager; - import abagames.a7xpg.A7xPrefManager; - import abagames.util.Logger; - import abagames.util.sdl.Input; - import abagames.util.sdl.MainLoop; -+import abagames.util.sdl.Sound; - - /** - * Boot A7Xpg. -@@ -29,8 +31,7 @@ - } - - private void parseArgs(char[][] args) { -- //for (int i = 1; i < argv.length; i++) { -- for (int i = 0; i < args.length; i++) { -+ for (int i = 1; i < args.length; i++) { - switch (args[i]) { - case "-brightness": - if (i >= args.length - 1) { -@@ -38,7 +39,7 @@ - exit(EXIT_FAILURE); - } - i++; -- float b = (float) atoi(args[i]) / 100; -+ float b = cast(float) atoi(args[i]) / 100; - if (b < 0 || b > 1) { - usage(); - exit(EXIT_FAILURE); -@@ -51,7 +52,7 @@ - exit(EXIT_FAILURE); - } - i++; -- float l = (float) atoi(args[i]) / 100; -+ float l = cast(float) atoi(args[i]) / 100; - if (l < 0 || l > 1) { - usage(); - exit(EXIT_FAILURE); -@@ -77,9 +78,7 @@ - } - } - --//public int main(char[][] argc) { --private int boot(char[] argl) { -- char[][] args = split(argl); -+public int main(char[][] args) { - screen = new A7xScreen; - input = new Input; - try { -@@ -92,32 +91,3 @@ - mainLoop.loop(); - return EXIT_SUCCESS; - } -- --// Boot as the windows executable. --import windows; -- --extern (C) void gc_init(); --extern (C) void gc_term(); --extern (C) void _minit(); --extern (C) void _moduleCtor(); -- --extern (Windows) --int WinMain(HINSTANCE hInstance, -- HINSTANCE hPrevInstance, -- LPSTR lpCmdLine, -- int nCmdShow) { -- int result; -- -- gc_init(); -- _minit(); -- try { -- _moduleCtor(); -- result = boot(string.toString(lpCmdLine)); -- } catch (Object o) { -- MessageBoxA(null, (char *)o.toString(), "Error", -- MB_OK | MB_ICONEXCLAMATION); -- result = 0; -- } -- gc_term(); -- return result; --} -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xGameManager.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xGameManager.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,12 +5,13 @@ - */ - module abagames.a7xpg.A7xGameManager; - --import math; -+import std.math; - import opengl; - import SDL; - import abagames.util.Rand; - import abagames.util.GameManager; - import abagames.util.ActorPool; -+import abagames.util.Vector; - import abagames.util.sdl.Screen3D; - import abagames.util.sdl.Texture; - import abagames.util.sdl.Input; -@@ -115,8 +116,8 @@ - int enemyTableIdx, enemyNum; - - public override void init() { -- prefManager = (A7xPrefManager) abstPrefManager; -- screen = (A7xScreen) abstScreen; -+ prefManager = cast(A7xPrefManager) abstPrefManager; -+ screen = cast(A7xScreen) abstScreen; - screen.makeLuminousTexture(); - rand = new Rand; - field = new Field; -@@ -189,7 +190,7 @@ - } - - public void addGold() { -- Gold gold = (Gold) golds.getInstance(); -+ Gold gold = cast(Gold) golds.getInstance(); - assert(gold); - gold.set(); - } -@@ -210,14 +211,14 @@ - - public void addBonus(int sc, Vector pos, float size) { - addScore(sc); -- Bonus bonus = (Bonus) bonuses.getInstanceForced(); -+ Bonus bonus = cast(Bonus) bonuses.getInstanceForced(); - assert(bonus); - bonus.set(sc, pos, size); - } - - public void getGold() { - playSe(0); -- addBonus(((int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); -+ addBonus((cast(int)(ship.speed / (ship.DEFAULT_SPEED / 2))) * 10, ship.pos, 0.7); - leftGold--; - if (leftGold - appGold >= 0) - addGold(); -@@ -235,14 +236,14 @@ - - public void addEnemy(int type, float size, float speed) { - playSe(5); -- Enemy enemy = (Enemy) enemies.getInstance(); -+ Enemy enemy = cast(Enemy) enemies.getInstance(); - if (!enemy) return; - enemy.set(type, size, speed); - } - - public void addParticle(Vector pos, float deg, float ofs, float speed, - float r, float g, float b) { -- Particle pt = (Particle) particles.getInstanceForced(); -+ Particle pt = cast(Particle) particles.getInstanceForced(); - assert(pt); - pt.set(pos, deg, ofs, speed, r, g, b); - } -@@ -254,16 +255,16 @@ - field.size.y = stgData[st][1]; - field.eyeZ = 300; - field.alpha = 1; -- stageTimer = stgData[st][2] * 60; -- leftGold = stgData[st][3]; -- appGold = stgData[st][4]; -- enemyAppInterval = stgData[st][5]; -+ stageTimer = cast(int)(stgData[st][2] * 60); -+ leftGold = cast(int)stgData[st][3]; -+ appGold = cast(int)stgData[st][4]; -+ enemyAppInterval = cast(int)(stgData[st][5]); - int ei = 0; - for (int i = 6; i < stgData[st].length;) { -- int n = stgData[st][i]; i++; -- int tp = stgData[st][i]; i++; -- float sz = stgData[st][i]; i++; -- float sp = stgData[st][i]; i++; -+ int n = cast(int)stgData[st][i]; i++; -+ int tp = cast(int)stgData[st][i]; i++; -+ float sz = cast(int)stgData[st][i]; i++; -+ float sp = cast(int)stgData[st][i]; i++; - for (int j = 0; j < n; j++) { - enemyTable[ei][0] = tp; - enemyTable[ei][1] = sz; -@@ -374,7 +375,7 @@ - if (enemyTableIdx == 0 && lap >= 1) { - int ei = enemyNum - 1; - for (int i = 0; i < lap * 2; i++) { -- addEnemy(enemyTable[ei][0], -+ addEnemy(cast(int)enemyTable[ei][0], - enemyTable[ei][1] * (1 + lap * 0.1), - enemyTable[ei][2] * (1 + lap * 0.1)); - ei--; -@@ -383,7 +384,7 @@ - } - } - enemyTimer = enemyAppInterval; -- addEnemy(enemyTable[enemyTableIdx][0], -+ addEnemy(cast(int)enemyTable[enemyTableIdx][0], - enemyTable[enemyTableIdx][1], - enemyTable[enemyTableIdx][2]); - enemyTableIdx++; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,9 @@ - */ - module abagames.a7xpg.A7xPrefManager; - --import stream; -+import std.stream; -+import std.c.stdlib; -+import std.string; - import abagames.util.PrefManager; - - /** -@@ -14,23 +16,27 @@ - public class A7xPrefManager: PrefManager { - public: - static const int VERSION_NUM = 10; -- static const char[] PREF_FILE = "a7xpg.prf"; -+ static const char[] PREF_FILE = ".a7xpg.prf"; - int hiScore; - - private void init() { - hiScore = 0; - } - -+ public char[] pref_file() { -+ return format("%s/%s", std.string.toString(getenv("HOME")), PREF_FILE); -+ } -+ - public void load() { - auto File fd = new File; - try { - int ver; -- fd.open(PREF_FILE); -+ fd.open(pref_file()); - fd.read(ver); - if (ver != VERSION_NUM) - throw new Error("Wrong version num"); - fd.read(hiScore); -- } catch (Error e) { -+ } catch (Exception e) { - init(); - } finally { - fd.close(); -@@ -39,7 +45,7 @@ - - public void save() { - auto File fd = new File; -- fd.create(PREF_FILE); -+ fd.create(pref_file()); - fd.write(VERSION_NUM); - fd.write(hiScore); - fd.close(); -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/A7xScreen.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/A7xScreen.d 2007-08-25 21:15:55.000000000 +0000 -@@ -6,6 +6,7 @@ - module abagames.a7xpg.A7xScreen; - - import opengl; -+import std.c.string; - import abagames.util.sdl.Screen3D; - - /** -@@ -40,13 +41,13 @@ - GLuint luminousTexture; - const int LUMINOUS_TEXTURE_WIDTH_MAX = 128; - const int LUMINOUS_TEXTURE_HEIGHT_MAX = 128; -- GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.size]; -+ GLuint td[LUMINOUS_TEXTURE_WIDTH_MAX * LUMINOUS_TEXTURE_HEIGHT_MAX * 4 * uint.sizeof]; - int luminousTextureWidth = 128, luminousTextureHeight = 128; - - public void makeLuminousTexture() { -- uint *data = td; -+ uint *data = cast(uint *)td; - int i; -- memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.size); -+ memset(data, 0, luminousTextureWidth * luminousTextureHeight * 4 * uint.sizeof); - glGenTextures(1, &luminousTexture); - glBindTexture(GL_TEXTURE_2D, luminousTexture); - glTexImage2D(GL_TEXTURE_2D, 0, 4, luminousTextureWidth, luminousTextureHeight, 0, -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Bonus.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Bonus.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Bonus.d 2007-08-25 21:15:55.000000000 +0000 -@@ -36,7 +36,7 @@ - tn /= 10; - pos.x = p.x - s / 2 * tn; pos.y = p.y; - size = s; -- cnt = 32 + s * 24; -+ cnt = cast(int)(32 + s * 24); - my = 0.03 + s * 0.2; - isExist = true; - } -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Enemy.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Enemy.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Enemy.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,13 +5,15 @@ - */ - module abagames.a7xpg.Enemy; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; - import abagames.util.ActorInitializer; - import abagames.a7xpg.LuminousActor; - import abagames.a7xpg.Ship; -+import abagames.a7xpg.Field; - import abagames.a7xpg.A7xGameManager; - import abagames.a7xpg.A7xScreen; - -@@ -48,7 +50,7 @@ - } - - public override void init(ActorInitializer ini) { -- EnemyInitializer ei = (EnemyInitializer) ini; -+ EnemyInitializer ei = cast(EnemyInitializer) ini; - ship = ei.ship; - field = ei.field; - rand = ei.rand; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Gold.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Gold.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Gold.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,8 @@ - */ - module abagames.a7xpg.Gold; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -37,7 +38,7 @@ - } - - public override void init(ActorInitializer ini) { -- GoldInitializer gi = (GoldInitializer) ini; -+ GoldInitializer gi = cast(GoldInitializer) ini; - ship = gi.ship; - field = gi.field; - rand = gi.rand; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LetterRender.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LetterRender.d 2007-08-25 21:15:55.000000000 +0000 -@@ -123,7 +123,7 @@ - float x, y, length, size, t; - int deg; - for ( i=0 ; ; i++ ) { -- deg = (int) spData[idx][i][4]; -+ deg = cast(int) spData[idx][i][4]; - if (deg > 99990) break; - x = -spData[idx][i][0]; - y = -spData[idx][i][1]; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActor.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LuminousActor.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActor.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.a7xpg.LuminousActor; - --import abagames.util.Actor; -+public import abagames.util.Actor; - - /** - * Actor with the luminous effect. -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActorPool.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/LuminousActorPool.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/LuminousActorPool.d 2007-08-25 21:15:55.000000000 +0000 -@@ -21,7 +21,7 @@ - public void drawLuminous() { - for (int i = 0; i < actor.length; i++) { - if (actor[i].isExist) -- ((LuminousActor) actor[i]).drawLuminous(); -+ (cast(LuminousActor) actor[i]).drawLuminous(); - } - } - } -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Particle.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Particle.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Particle.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.a7xpg.Particle; - --import math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -34,7 +34,7 @@ - } - - public override void init(ActorInitializer ini) { -- ParticleInitializer pi = (ParticleInitializer) ini; -+ ParticleInitializer pi = cast(ParticleInitializer) ini; - field = pi.field; - rand = pi.rand; - pos = new Vector; -Index: a7xpg-0.11.dfsg1/src/abagames/a7xpg/Ship.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/a7xpg/Ship.d 2007-08-25 21:14:07.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/a7xpg/Ship.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,8 @@ - */ - module abagames.a7xpg.Ship; - --import math; -+import math = std.math; -+import std.math; - import opengl; - import abagames.util.Vector; - import abagames.util.Rand; -@@ -237,7 +238,7 @@ - manager.addParticle(pos, deg + math.PI + rand.nextFloat(0.5) - 0.25, SIZE, ps, pr, pg, pb); - } - if (hitWall && pSpeed > DEFAULT_SPEED * 1.1) { -- int pn = pSpeed / (DEFAULT_SPEED / 4); -+ int pn = cast(int)(pSpeed / (DEFAULT_SPEED / 4)); - for (int i = 0; i < pn; i++) { - manager.addParticle(pos, deg + rand.nextFloat(1.2) - 0.6, SIZE, pSpeed * 3, - 0.8, 0.6, 0.1); -Index: a7xpg-0.11.dfsg1/src/abagames/util/Actor.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Actor.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/Actor.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.util.Actor; - --import abagames.util.ActorInitializer; -+public import abagames.util.ActorInitializer; - - /** - * Actor in the game that has the interface to move and draw. -Index: a7xpg-0.11.dfsg1/src/abagames/util/Logger.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Logger.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/Logger.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,28 +5,28 @@ - */ - module abagames.util.Logger; - --import stream; -+import std.cstream; - - /** - * Logger(error/info). - */ - public class Logger { - public static void info(char[] msg) { -- stderr.writeLine("Info: " ~ msg); -+ derr.writeLine("Info: " ~ msg); - } - - public static void error(char[] msg) { -- //stderr.writeLine("Error: " ~ msg); -+ //derr.writeLine("Error: " ~ msg); - throw new Exception("Error: " ~ msg ~ "\0"); - } - - public static void error(Exception e) { -- //stderr.writeLine("Error: " ~ e.toString()); -+ //derr.writeLine("Error: " ~ e.toString()); - throw new Exception("Error: " ~ e.toString() ~ "\0"); - } - - public static void error(Error e) { -- //stderr.writeLine("Error: " ~ e.toString()); -+ //derr.writeLine("Error: " ~ e.toString()); - //if (e.next) - // error(e.next); - throw new Exception("Error: " ~ e.toString() ~ "\0"); -Index: a7xpg-0.11.dfsg1/src/abagames/util/Rand.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Rand.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/Rand.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,8 +5,8 @@ - */ - module abagames.util.Rand; - --import random; --import date; -+import std.random; -+import std.date; - - /** - * Random number generator. -@@ -19,14 +19,14 @@ - } - - public int nextInt(int n) { -- return random.rand() % n; -+ return rand() % n; - } - - public int nextSignedInt(int n) { -- return random.rand() % (n * 2) - n; -+ return rand() % (n * 2) - n; - } - - public float nextFloat(float n) { -- return ((float)(random.rand() % (n * 10000))) / 10000; -+ return (cast(float)(rand() % (n * 10000))) / 10000; - } - } -Index: a7xpg-0.11.dfsg1/src/abagames/util/Vector.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/Vector.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/Vector.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.util.Vector; - --import math; -+import std.math; - - /** - * Vector. -@@ -60,19 +60,19 @@ - } - - public int checkSide(Vector pos1, Vector pos2) { -- int xo = pos2.x - pos1.x; -- int yo = pos2.y - pos1.y; -+ int xo = cast(int)(pos2.x - pos1.x); -+ int yo = cast(int)(pos2.y - pos1.y); - if (xo == 0) { - if (yo == 0) - return 0; -- return x - pos1.x; -+ return cast(int)(x - pos1.x); - } else if (yo == 0) { -- return pos1.y - y; -+ return cast(int)(pos1.y - y); - } else { - if (xo * yo > 0) { -- return (x - pos1.x) / xo - (y - pos1.y) / yo; -+ return cast(int)((x - pos1.x) / xo - (y - pos1.y) / yo); - } else { -- return -(x - pos1.x) / xo + (y - pos1.y) / yo; -+ return cast(int)(-(x - pos1.x) / xo + (y - pos1.y) / yo); - } - } - } -Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Input.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Input.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Input; - --import string; -+import string = std.string; - import SDL; - import abagames.util.sdl.SDLInitFailedException; - -Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/MainLoop.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/MainLoop.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,8 +5,7 @@ - */ - module abagames.util.sdl.MainLoop; - --import string; --import c.stdlib; -+import std.c.stdlib; - import SDL; - import abagames.util.Logger; - import abagames.util.Rand; -@@ -88,7 +87,7 @@ - done = 1; - - nowTick = SDL_GetTicks(); -- frame = (int) (nowTick-prvTickCount) / interval; -+ frame = cast(int) (nowTick-prvTickCount) / interval; - if (frame <= 0) { - frame = 1; - SDL_Delay(prvTickCount+interval-nowTick); -Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Screen3D.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Screen3D.d 2007-08-25 21:15:55.000000000 +0000 -@@ -5,8 +5,8 @@ - */ - module abagames.util.sdl.Screen3D; - --import string; --import c.stdlib; -+import string = std.string; -+import std.c.stdlib; - import SDL; - import opengl; - import abagames.util.Logger; -@@ -64,11 +64,11 @@ - glViewport(0, 0, width, height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); -- //gluPerspective(45.0f, (GLfloat)width/(GLfloat)height, nearPlane, farPlane); -+ //gluPerspective(45.0f, cast(GLfloat)width/cast(GLfloat)height, nearPlane, farPlane); - glFrustum(-nearPlane, - nearPlane, -- -nearPlane * (GLfloat)height / (GLfloat)width, -- nearPlane * (GLfloat)height / (GLfloat)width, -+ -nearPlane * cast(GLfloat)height / cast(GLfloat)width, -+ nearPlane * cast(GLfloat)height / cast(GLfloat)width, - 0.1f, farPlane); - glMatrixMode(GL_MODELVIEW); - } -Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Sound.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Sound.d 2007-08-25 21:17:28.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Sound; - --import string; -+import string = std.string; - import SDL; - import SDL_mixer; - import abagames.util.sdl.SDLInitFailedException; -@@ -17,8 +17,8 @@ - public: - static bool noSound = false; - static int fadeOutSpeed = 1280; -- static char[] soundsDir = "sounds/"; -- static char[] chunksDir = "sounds/"; -+ static char[] soundsDir = "/usr/share/games/a7xpg/sounds/"; -+ static char[] chunksDir = "/usr/share/games/a7xpg/sounds/"; - - public static void init() { - if (noSound) return; -Index: a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d -=================================================================== ---- a7xpg-0.11.dfsg1.orig/src/abagames/util/sdl/Texture.d 2007-08-25 21:14:06.000000000 +0000 -+++ a7xpg-0.11.dfsg1/src/abagames/util/sdl/Texture.d 2007-08-25 21:17:07.000000000 +0000 -@@ -5,7 +5,7 @@ - */ - module abagames.util.sdl.Texture; - --import string; -+import string = std.string; - import opengl; - import SDL; - import abagames.util.sdl.SDLInitFailedException; -@@ -15,7 +15,7 @@ - */ - public class Texture { - public: -- static char[] imagesDir = "images/"; -+ static char[] imagesDir = "/usr/share/games/a7xpg/images/"; - - private: - GLuint num; diff -Nru a7xpg-0.11.dfsg1/debian/patches/imports.patch a7xpg-0.11.dfsg1/debian/patches/imports.patch --- a7xpg-0.11.dfsg1/debian/patches/imports.patch 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/imports.patch 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1,1867 @@ +Description: port import/ code to D language version 2 + With this patch the code is accapted by GDC 4.8 without triggering deprecation + warnings/errors. +Author: Peter De Wachter + +--- a/import/SDL.d ++++ b/import/SDL.d +@@ -20,18 +20,28 @@ + slouken@devolution.com + */ + +-import SDL_types; +-import SDL_getenv; +-import SDL_error; +-import SDL_rwops; +-import SDL_timer; +-import SDL_audio; +-import SDL_cdrom; +-import SDL_joystick; +-import SDL_events; +-import SDL_video; +-import SDL_byteorder; +-import SDL_version; ++public import SDL_keysym_; ++public import SDL_version_; ++public import SDL_active; ++public import SDL_audio; ++public import SDL_byteorder; ++public import SDL_cdrom; ++public import SDL_copying; ++public import SDL_endian; ++public import SDL_error; ++public import SDL_events; ++public import SDL_getenv; ++public import SDL_joystick; ++public import SDL_keyboard; ++public import SDL_mouse; ++public import SDL_mutex; ++public import SDL_quit; ++public import SDL_rwops; ++public import SDL_syswm; ++public import SDL_thread; ++public import SDL_timer; ++public import SDL_types; ++public import SDL_video; + + extern(C): + +@@ -73,18 +83,3 @@ + */ + void SDL_Quit(); + +-void SDL_SetModuleHandle(void *hInst); +-extern(Windows) void* GetModuleHandle(char*); +- +-static this() +-{ +- /* Load SDL dynamic link library */ +- if (SDL_Init(SDL_INIT_NOPARACHUTE) < 0) +- throw new Error("Error loading SDL"); +- SDL_SetModuleHandle(GetModuleHandle(null)); +-} +- +-static ~this() +-{ +- SDL_Quit(); +-} +\ No newline at end of file +--- a/import/SDL_audio.d ++++ b/import/SDL_audio.d +@@ -24,6 +24,7 @@ + import SDL_error; + import SDL_rwops; + import SDL_byteorder; ++import std.string; + + extern(C): + +@@ -42,7 +43,7 @@ + Once the callback returns, the buffer will no longer be valid. + Stereo samples are stored in a LRLRLR ordering. + */ +- void (*callback)(void *userdata, Uint8 *stream, int len); ++ void function(void *userdata, Uint8 *stream, int len) callback; + void *userdata; + } + +@@ -74,7 +75,7 @@ + int len_cvt; /* Length of converted audio buffer */ + int len_mult; /* buffer must be len*len_mult big */ + double len_ratio; /* Given len, final size is len*len_ratio */ +- void (*filters[10])(SDL_AudioCVT *cvt, Uint16 format); ++ void function(SDL_AudioCVT *cvt, Uint16 format)[10] filters; + int filter_index; /* Current audio conversion function */ + } + +@@ -161,7 +162,7 @@ + * This function loads a WAVE from the data source, automatically freeing + * that source if 'freesrc' is non-zero. For example, to load a WAVE file, + * you could do: +- * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); ++ * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", toStringz("rb")), 1, ...); + * + * If this function succeeds, it returns the given SDL_AudioSpec, + * filled with the audio data format of the wave data, and sets +@@ -178,7 +179,7 @@ + SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len); + + /* Compatibility convenience function -- loads a WAV from a file */ +-SDL_AudioSpec *SDL_LoadWAV(char* file, SDL_AudioSpec* spec, ++SDL_AudioSpec *SDL_LoadWAV(const(char)* file, SDL_AudioSpec* spec, + Uint8 **audio_buf, Uint32 *audio_len) + { + return SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1, spec, +--- a/import/SDL_cdrom.d ++++ b/import/SDL_cdrom.d +@@ -49,7 +49,7 @@ + } + + /* Given a status, returns true if there's a disk in the drive */ +-bit CD_INDRIVE(int status) { return status > 0; } ++bool CD_INDRIVE(int status) { return status > 0; } + + struct SDL_CDtrack { + Uint8 id; /* Track number */ +--- a/import/SDL_endian.d ++++ b/import/SDL_endian.d +@@ -47,7 +47,7 @@ + */ + + Uint16 SDL_Swap16(Uint16 D) { +- return((D<<8)|(D>>8)); ++ return cast(Uint16)((D<<8)|(D>>8)); + } + + Uint32 SDL_Swap32(Uint32 D) { +@@ -57,9 +57,9 @@ + Uint64 SDL_Swap64(Uint64 val) { + Uint32 hi, lo; + /* Separate into high and low 32-bit values and swap them */ +- lo = (Uint32)(val&0xFFFFFFFF); ++ lo = cast(Uint32)(val&0xFFFFFFFF); + val >>= 32; +- hi = (Uint32)(val&0xFFFFFFFF); ++ hi = cast(Uint32)(val&0xFFFFFFFF); + val = SDL_Swap32(lo); + val <<= 32; + val |= SDL_Swap32(hi); +--- a/import/SDL_events.d ++++ b/import/SDL_events.d +@@ -271,7 +271,7 @@ + + The filter is protypted as: + */ +-alias int (*SDL_EventFilter)(SDL_Event *event); ++alias int function(SDL_Event *event) SDL_EventFilter; + /* + If the filter returns 1, then the event will be added to the internal queue. + If it returns 0, then the event will be dropped from the queue, but the +@@ -304,8 +304,8 @@ + If 'state' is set to SDL_QUERY, SDL_EventState() will return the + current processing state of the specified event. + */ +-const uint SDL_QUERY = -1; +-const uint SDL_IGNORE = 0; +-const uint SDL_DISABLE = 0; +-const uint SDL_ENABLE = 1; ++const int SDL_QUERY = -1; ++const int SDL_IGNORE = 0; ++const int SDL_DISABLE = 0; ++const int SDL_ENABLE = 1; + Uint8 SDL_EventState(Uint8 type, int state); +--- a/import/SDL_getenv.d ++++ b/import/SDL_getenv.d +@@ -2,6 +2,7 @@ + + extern(C): + ++/+ + /* Put a variable of the form "name=value" into the environment */ + int SDL_putenv(char *variable); + int putenv(char* X) { return SDL_putenv(X); } +@@ -9,3 +10,4 @@ + /* Retrieve a variable named "name" from the environment */ + char *SDL_getenv(char *name); + char *getenv(char* X) { return SDL_getenv(X); } +++/ +--- a/import/SDL_keyboard.d ++++ b/import/SDL_keyboard.d +@@ -26,7 +26,7 @@ + // !!! A hack! struct SDL_keysym is defined in this module, + // !!! so we need to resolve the nameclash... + // !!! Definitely won't work on *NIX but for now will do. +-import SDL_Keysym; ++import SDL_keysym_; + + extern(C): + +--- a/import/SDL_mixer.d ++++ b/import/SDL_mixer.d +@@ -22,7 +22,7 @@ + + // convert to D by shinichiro.h + +-/* $Id: SDL_mixer.d,v 1.1.1.1 2003/09/19 14:55:49 kenta Exp $ */ ++/* $Id: SDL_mixer.d,v 1.1.1.1 2006/11/19 07:54:54 kenta Exp $ */ + + import SDL; + +@@ -104,10 +104,10 @@ + + /* Load a wave file or a music (.mod .s3m .it .xm) file */ + Mix_Chunk * Mix_LoadWAV_RW(SDL_RWops *src, int freesrc); +- Mix_Chunk * Mix_LoadWAV(char *file) { ++ Mix_Chunk * Mix_LoadWAV(const(char) *file) { + return Mix_LoadWAV_RW(SDL_RWFromFile(file, "rb"), 1); + } +- Mix_Music * Mix_LoadMUS(char *file); ++ Mix_Music * Mix_LoadMUS(const(char) *file); + + /* Load a wave file of the mixer format from a memory buffer */ + Mix_Chunk * Mix_QuickLoad_WAV(Uint8 *mem); +@@ -128,19 +128,17 @@ + This can be used to provide real-time visual display of the audio stream + or add a custom mixer filter for the stream data. + */ +- void Mix_SetPostMix(void (*mix_func) +- (void *udata, Uint8 *stream, int len), void *arg); ++ void Mix_SetPostMix(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg); + + /* Add your own music player or additional mixer function. + If 'mix_func' is NULL, the default music player is re-enabled. + */ +- void Mix_HookMusic(void (*mix_func) +- (void *udata, Uint8 *stream, int len), void *arg); ++ void Mix_HookMusic(void function(void *udata, Uint8 *stream, int len) mix_func, void *arg); + + /* Add your own callback when the music has finished playing. + This callback is only called if the music finishes naturally. + */ +- void Mix_HookMusicFinished(void (*music_finished)()); ++ void Mix_HookMusicFinished(void function() music_finished); + + /* Get a pointer to the user data for the current music hook */ + void * Mix_GetMusicHookData(); +@@ -153,7 +151,7 @@ + * inside the audio callback, or SDL_mixer will explicitly lock the audio + * before calling your callback. + */ +- void Mix_ChannelFinished(void (*channel_finished)(int channel)); ++ void Mix_ChannelFinished(void function(int channel) channel_finished); + + + /* Special Effects API by ryan c. gordon. (icculus@linuxgames.com) */ +@@ -177,7 +175,7 @@ + * + * DO NOT EVER call SDL_LockAudio() from your callback function! + */ +- typedef void (*Mix_EffectFunc_t)(int chan, void *stream, int len, void *udata); ++ alias void function(int chan, void *stream, int len, void *udata) Mix_EffectFunc_t; + + /* + * This is a callback that signifies that a channel has finished all its +@@ -188,7 +186,7 @@ + * + * DO NOT EVER call SDL_LockAudio() from your callback function! + */ +- typedef void (*Mix_EffectDone_t)(int chan, void *udata); ++ alias void function(int chan, void *udata) Mix_EffectDone_t; + + + /* Register a special effect function. At mixing time, the channel data is +@@ -510,7 +508,7 @@ + int Mix_PlayingMusic(); + + /* Stop music and set external music playback command */ +- int Mix_SetMusicCMD(char *command); ++ int Mix_SetMusicCMD(const(char) *command); + + /* Synchro value is set by MikMod from modules while playing */ + int Mix_SetSynchroValue(int value); +--- a/import/SDL_mouse.d ++++ b/import/SDL_mouse.d +@@ -109,6 +109,8 @@ + const uint SDL_BUTTON_LEFT = 1; + const uint SDL_BUTTON_MIDDLE = 2; + const uint SDL_BUTTON_RIGHT = 3; ++const uint SDL_BUTTON_WHEELUP = 4; ++const uint SDL_BUTTON_WHEELDOWN = 5; + const uint SDL_BUTTON_LMASK = SDL_PRESSED << (SDL_BUTTON_LEFT - 1); + const uint SDL_BUTTON_MMASK = SDL_PRESSED << (SDL_BUTTON_MIDDLE - 1); + const uint SDL_BUTTON_RMASK = SDL_PRESSED << (SDL_BUTTON_RIGHT - 1); +--- a/import/SDL_quit.d ++++ b/import/SDL_quit.d +@@ -40,8 +40,8 @@ + */ + + /* There are no functions directly affecting the quit event */ +-bit SDL_QuitRequested() ++bool SDL_QuitRequested() + { + SDL_PumpEvents(); +- return SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK); ++ return 0 != SDL_PeepEvents(null, 0, SDL_PEEKEVENT, SDL_QUITMASK); + } +--- a/import/SDL_rwops.d ++++ b/import/SDL_rwops.d +@@ -35,22 +35,22 @@ + SEEK_SET, SEEK_CUR, SEEK_END + Returns the final offset in the data source. + */ +- int (*seek)(SDL_RWops *context, int offset, int whence); ++ int function(SDL_RWops *context, int offset, int whence) seek; + + /* Read up to 'num' objects each of size 'objsize' from the data + source to the area pointed at by 'ptr'. + Returns the number of objects read, or -1 if the read failed. + */ +- int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); ++ int function(SDL_RWops *context, void *ptr, int size, int maxnum) read; + + /* Write exactly 'num' objects each of size 'objsize' from the area + pointed at by 'ptr' to data source. + Returns 'num', or -1 if the write failed. + */ +- int (*write)(SDL_RWops *context, void *ptr, int size, int num); ++ int function(SDL_RWops *context, void *ptr, int size, int num) write; + + /* Close and free an allocated SDL_FSops structure */ +- int (*close)(SDL_RWops *context); ++ int function(SDL_RWops *context) close; + + Uint32 type; + union { +@@ -72,7 +72,7 @@ + + /* Functions to create SDL_RWops structures from various data sources */ + +-SDL_RWops * SDL_RWFromFile(char *file, char *mode); ++SDL_RWops * SDL_RWFromFile(const(char)* file, const(char)* mode); + + SDL_RWops * SDL_RWFromFP(void *fp, int autoclose); + +@@ -84,35 +84,25 @@ + /* Macros to easily read and write from an SDL_RWops structure */ + int SDL_RWseek(SDL_RWops *ctx, int offset, int whence) + { +- int (*seek)(SDL_RWops *context, int offset, int whence); +- seek = ctx.seek; +- return (*seek)(ctx, offset, whence); ++ return ctx.seek(ctx, offset, whence); + } + + int SDL_RWtell(SDL_RWops *ctx) + { +- int (*seek)(SDL_RWops *context, int offset, int whence); +- seek = ctx.seek; +- return (*seek)(ctx, 0, 1); ++ return ctx.seek(ctx, 0, 1); + } + + int SDL_RWread(SDL_RWops *ctx, void* ptr, int size, int n) + { +- int (*read)(SDL_RWops *context, void *ptr, int size, int maxnum); +- read = ctx.read; +- return (*read)(ctx, ptr, size, n); ++ return ctx.read(ctx, ptr, size, n); + } + + int SDL_RWwrite(SDL_RWops *ctx, void* ptr, int size, int n) + { +- int (*write)(SDL_RWops *context, void *ptr, int size, int num); +- write = ctx.write; +- return (*write)(ctx, ptr, size, n); ++ return ctx.write(ctx, ptr, size, n); + } + + int SDL_RWclose(SDL_RWops *ctx) + { +- int (*close)(SDL_RWops *context); +- close = ctx.close; +- return (*close)(ctx); ++ return ctx.close(ctx); + } +--- a/import/SDL_syswm.d ++++ b/import/SDL_syswm.d +@@ -22,7 +22,7 @@ + + /* Include file for SDL custom system window manager hooks */ + +-import SDL_version; ++import SDL_version_; + + extern(C): + +--- a/import/SDL_thread.d ++++ b/import/SDL_thread.d +@@ -34,7 +34,7 @@ + struct SDL_Thread { } + + /* Create a thread */ +-SDL_Thread * SDL_CreateThread(int (*fn)(void *), void *data); ++SDL_Thread * SDL_CreateThread(int function(void *) fn, void *data); + + /* Get the 32-bit thread identifier for the current thread */ + Uint32 SDL_ThreadID(); +--- a/import/SDL_timer.d ++++ b/import/SDL_timer.d +@@ -39,7 +39,7 @@ + void SDL_Delay(Uint32 ms); + + /* Function prototype for the timer callback function */ +-alias Uint32 (*SDL_TimerCallback)(Uint32 interval); ++alias Uint32 function(Uint32 interval) SDL_TimerCallback; + + /* Set a callback to run after the specified number of milliseconds has + * elapsed. The callback function is passed the current timer interval +@@ -79,7 +79,7 @@ + * passed in, the periodic alarm continues, otherwise a new alarm is + * scheduled. If the callback returns 0, the periodic alarm is cancelled. + */ +-alias Uint32 (*SDL_NewTimerCallback)(Uint32 interval, void *param); ++alias Uint32 function(Uint32 interval, void *param) SDL_NewTimerCallback; + + /* Definition of the timer ID type */ + alias void *SDL_TimerID; +--- a/import/SDL_types.d ++++ b/import/SDL_types.d +@@ -33,7 +33,7 @@ + alias ushort Uint16; + alias short Sint16; + alias uint Uint32; +-alias int Sint32; ++alias int Sint32; + + alias ulong Uint64; + alias long Sint64; +--- a/import/SDL_video.d ++++ b/import/SDL_video.d +@@ -74,9 +74,9 @@ + Uint8 alpha; + } + +-/* typedef for private surface blitting functions */ +-typedef int (*SDL_blit)(SDL_Surface *src, SDL_Rect *srcrect, +- SDL_Surface *dst, SDL_Rect *dstrect); ++/* alias for private surface blitting functions */ ++alias int function(SDL_Surface *src, SDL_Rect *srcrect, ++ SDL_Surface *dst, SDL_Rect *dstrect) SDL_blit; + + /* This structure should be treated as read-only, except for 'pixels', + which, if not NULL, contains the raw pixel data for the surface. +@@ -132,7 +132,7 @@ + const uint SDL_PREALLOC = 0x01000000; /* Surface uses preallocated memory */ + + /* Evaluates to true if the surface needs to be locked before access */ +-bit SDL_MUSTLOCK(SDL_Surface *surface) ++bool SDL_MUSTLOCK(SDL_Surface *surface) + { + return surface.offset || ((surface.flags & + (SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_RLEACCEL)) != 0); +@@ -186,7 +186,7 @@ + /* Special flags */ + union + { +- bit hw_overlay; ++ bool hw_overlay; + Uint32 _dummy; + } + // Uint32 hw_overlay :1; /* Flag: This overlay hardware accelerated? */ +@@ -540,7 +540,7 @@ + SDL_Surface * SDL_LoadBMP_RW(SDL_RWops *src, int freesrc); + + /* Convenience macro -- load a surface from a file */ +-SDL_Surface * SDL_LoadBMP(char* file) ++SDL_Surface * SDL_LoadBMP(const(char)* file) + { + return SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1); + } +@@ -554,7 +554,7 @@ + (SDL_Surface *surface, SDL_RWops *dst, int freedst); + + /* Convenience macro -- save a surface to a file */ +-int SDL_SaveBMP(SDL_Surface *surface, char* file) ++int SDL_SaveBMP(SDL_Surface *surface, const(char)* file) + { + return SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1); + } +@@ -837,7 +837,7 @@ + /* + * Sets/Gets the title and icon text of the display window + */ +-void SDL_WM_SetCaption(char *title, char *icon); ++void SDL_WM_SetCaption(const(char) *title, char *icon); + void SDL_WM_GetCaption(char **title, char **icon); + + /* +--- a/import/opengl.d ++++ b/import/opengl.d +@@ -1,6 +1,4 @@ +-import windows; +- +-extern(Windows): ++extern(System): + + alias uint GLenum; + alias ubyte GLboolean; +@@ -161,6 +159,7 @@ + const uint GL_3_BYTES = 0x1408; + const uint GL_4_BYTES = 0x1409; + const uint GL_DOUBLE = 0x140A; ++const uint GL_UNSIGNED_INT_8_8_8_8_REV = 0x8367; + + /* DepthFunction */ + /* GL_NEVER */ +@@ -1111,376 +1110,369 @@ + + /*************************************************************/ + +-extern(Windows) void /*APIENTRY*/glAccum (GLenum op, GLfloat value); +-extern(Windows) void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref); +-extern(Windows) GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); +-extern(Windows) void /*APIENTRY*/glArrayElement (GLint i); +-extern(Windows) void /*APIENTRY*/glBegin (GLenum mode); +-extern(Windows) void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); +-extern(Windows) void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); +-extern(Windows) void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); +-extern(Windows) void /*APIENTRY*/glCallList (GLuint list); +-extern(Windows) void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); +-extern(Windows) void /*APIENTRY*/glClear (GLbitfield mask); +-extern(Windows) void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +-extern(Windows) void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +-extern(Windows) void /*APIENTRY*/glClearDepth (GLclampd depth); +-extern(Windows) void /*APIENTRY*/glClearIndex (GLfloat c); +-extern(Windows) void /*APIENTRY*/glClearStencil (GLint s); +-extern(Windows) void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); +-extern(Windows) void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); +-extern(Windows) void /*APIENTRY*/glColor3bv (GLbyte *v); +-extern(Windows) void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); +-extern(Windows) void /*APIENTRY*/glColor3dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); +-extern(Windows) void /*APIENTRY*/glColor3fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); +-extern(Windows) void /*APIENTRY*/glColor3iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); +-extern(Windows) void /*APIENTRY*/glColor3sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); +-extern(Windows) void /*APIENTRY*/glColor3ubv (GLubyte *v); +-extern(Windows) void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); +-extern(Windows) void /*APIENTRY*/glColor3uiv (GLuint *v); +-extern(Windows) void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); +-extern(Windows) void /*APIENTRY*/glColor3usv (GLushort *v); +-extern(Windows) void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); +-extern(Windows) void /*APIENTRY*/glColor4bv (GLbyte *v); +-extern(Windows) void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); +-extern(Windows) void /*APIENTRY*/glColor4dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +-extern(Windows) void /*APIENTRY*/glColor4fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); +-extern(Windows) void /*APIENTRY*/glColor4iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); +-extern(Windows) void /*APIENTRY*/glColor4sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); +-extern(Windows) void /*APIENTRY*/glColor4ubv (GLubyte *v); +-extern(Windows) void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); +-extern(Windows) void /*APIENTRY*/glColor4uiv (GLuint *v); +-extern(Windows) void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); +-extern(Windows) void /*APIENTRY*/glColor4usv (GLushort *v); +-extern(Windows) void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +-extern(Windows) void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); +-extern(Windows) void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); +-extern(Windows) void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); +-extern(Windows) void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +-extern(Windows) void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +-extern(Windows) void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +-extern(Windows) void /*APIENTRY*/glCullFace (GLenum mode); +-extern(Windows) void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); +-extern(Windows) void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); +-extern(Windows) void /*APIENTRY*/glDepthFunc (GLenum func); +-extern(Windows) void /*APIENTRY*/glDepthMask (GLboolean flag); +-extern(Windows) void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); +-extern(Windows) void /*APIENTRY*/glDisable (GLenum cap); +-extern(Windows) void /*APIENTRY*/glDisableClientState (GLenum array); +-extern(Windows) void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); +-extern(Windows) void /*APIENTRY*/glDrawBuffer (GLenum mode); +-extern(Windows) void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); +-extern(Windows) void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glEdgeFlag (GLboolean flag); +-extern(Windows) void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); +-extern(Windows) void /*APIENTRY*/glEnable (GLenum cap); +-extern(Windows) void /*APIENTRY*/glEnableClientState (GLenum array); +-extern(Windows) void /*APIENTRY*/glEnd (); +-extern(Windows) void /*APIENTRY*/glEndList (); +-extern(Windows) void /*APIENTRY*/glEvalCoord1d (GLdouble u); +-extern(Windows) void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); +-extern(Windows) void /*APIENTRY*/glEvalCoord1f (GLfloat u); +-extern(Windows) void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); +-extern(Windows) void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); +-extern(Windows) void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); +-extern(Windows) void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); +-extern(Windows) void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); +-extern(Windows) void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); +-extern(Windows) void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); +-extern(Windows) void /*APIENTRY*/glEvalPoint1 (GLint i); +-extern(Windows) void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); +-extern(Windows) void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); +-extern(Windows) void /*APIENTRY*/glFinish (); +-extern(Windows) void /*APIENTRY*/glFlush (); +-extern(Windows) void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glFogi (GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glFrontFace (GLenum mode); +-extern(Windows) void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +-extern(Windows) GLuint /*APIENTRY*/glGenLists (GLsizei range); +-extern(Windows) void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); +-extern(Windows) void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); +-extern(Windows) void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); +-extern(Windows) void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); +-extern(Windows) GLenum /*APIENTRY*/glGetError (); +-extern(Windows) void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); +-extern(Windows) void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); +-extern(Windows) void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); +-extern(Windows) void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); +-extern(Windows) void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); +-extern(Windows) void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); +-extern(Windows) void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); +-extern(Windows) void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); +-extern(Windows) GLubyte * /*APIENTRY*/glGetString (GLenum name); +-extern(Windows) void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); +-extern(Windows) void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glHint (GLenum target, GLenum mode); +-extern(Windows) void /*APIENTRY*/glIndexMask (GLuint mask); +-extern(Windows) void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glIndexd (GLdouble c); +-extern(Windows) void /*APIENTRY*/glIndexdv (GLdouble *c); +-extern(Windows) void /*APIENTRY*/glIndexf (GLfloat c); +-extern(Windows) void /*APIENTRY*/glIndexfv (GLfloat *c); +-extern(Windows) void /*APIENTRY*/glIndexi (GLint c); +-extern(Windows) void /*APIENTRY*/glIndexiv (GLint *c); +-extern(Windows) void /*APIENTRY*/glIndexs (GLshort c); +-extern(Windows) void /*APIENTRY*/glIndexsv (GLshort *c); +-extern(Windows) void /*APIENTRY*/glIndexub (GLubyte c); +-extern(Windows) void /*APIENTRY*/glIndexubv (GLubyte *c); +-extern(Windows) void /*APIENTRY*/glInitNames (); +-extern(Windows) void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); +-extern(Windows) GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); +-extern(Windows) GLboolean /*APIENTRY*/glIsList (GLuint list); +-extern(Windows) GLboolean /*APIENTRY*/glIsTexture (GLuint texture); +-extern(Windows) void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); +-extern(Windows) void /*APIENTRY*/glLineWidth (GLfloat width); +-extern(Windows) void /*APIENTRY*/glListBase (GLuint base); +-extern(Windows) void /*APIENTRY*/glLoadIdentity (); +-extern(Windows) void /*APIENTRY*/glLoadMatrixd (GLdouble *m); +-extern(Windows) void /*APIENTRY*/glLoadMatrixf (GLfloat *m); +-extern(Windows) void /*APIENTRY*/glLoadName (GLuint name); +-extern(Windows) void /*APIENTRY*/glLogicOp (GLenum opcode); +-extern(Windows) void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); +-extern(Windows) void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); +-extern(Windows) void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); +-extern(Windows) void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); +-extern(Windows) void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); +-extern(Windows) void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); +-extern(Windows) void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); +-extern(Windows) void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); +-extern(Windows) void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glMatrixMode (GLenum mode); +-extern(Windows) void /*APIENTRY*/glMultMatrixd (GLdouble *m); +-extern(Windows) void /*APIENTRY*/glMultMatrixf (GLfloat *m); +-extern(Windows) void /*APIENTRY*/glNewList (GLuint list, GLenum mode); +-extern(Windows) void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); +-extern(Windows) void /*APIENTRY*/glNormal3bv (GLbyte *v); +-extern(Windows) void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); +-extern(Windows) void /*APIENTRY*/glNormal3dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); +-extern(Windows) void /*APIENTRY*/glNormal3fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); +-extern(Windows) void /*APIENTRY*/glNormal3iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); +-extern(Windows) void /*APIENTRY*/glNormal3sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); +-extern(Windows) void /*APIENTRY*/glPassThrough (GLfloat token); +-extern(Windows) void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); +-extern(Windows) void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); +-extern(Windows) void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); +-extern(Windows) void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); +-extern(Windows) void /*APIENTRY*/glPointSize (GLfloat size); +-extern(Windows) void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); +-extern(Windows) void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); +-extern(Windows) void /*APIENTRY*/glPolygonStipple (GLubyte *mask); +-extern(Windows) void /*APIENTRY*/glPopAttrib (); +-extern(Windows) void /*APIENTRY*/glPopClientAttrib (); +-extern(Windows) void /*APIENTRY*/glPopMatrix (); +-extern(Windows) void /*APIENTRY*/glPopName (); +-extern(Windows) void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); +-extern(Windows) void /*APIENTRY*/glPushAttrib (GLbitfield mask); +-extern(Windows) void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); +-extern(Windows) void /*APIENTRY*/glPushMatrix (); +-extern(Windows) void /*APIENTRY*/glPushName (GLuint name); +-extern(Windows) void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); +-extern(Windows) void /*APIENTRY*/glRasterPos2dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); +-extern(Windows) void /*APIENTRY*/glRasterPos2fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); +-extern(Windows) void /*APIENTRY*/glRasterPos2iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); +-extern(Windows) void /*APIENTRY*/glRasterPos2sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); +-extern(Windows) void /*APIENTRY*/glRasterPos3dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); +-extern(Windows) void /*APIENTRY*/glRasterPos3fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); +-extern(Windows) void /*APIENTRY*/glRasterPos3iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); +-extern(Windows) void /*APIENTRY*/glRasterPos3sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); +-extern(Windows) void /*APIENTRY*/glRasterPos4dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); +-extern(Windows) void /*APIENTRY*/glRasterPos4fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); +-extern(Windows) void /*APIENTRY*/glRasterPos4iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); +-extern(Windows) void /*APIENTRY*/glRasterPos4sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glReadBuffer (GLenum mode); +-extern(Windows) void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +-extern(Windows) void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); +-extern(Windows) void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); +-extern(Windows) void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); +-extern(Windows) void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); +-extern(Windows) void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); +-extern(Windows) void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); +-extern(Windows) void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); +-extern(Windows) GLint /*APIENTRY*/glRenderMode (GLenum mode); +-extern(Windows) void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); +-extern(Windows) void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); +-extern(Windows) void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); +-extern(Windows) void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); +-extern(Windows) void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); +-extern(Windows) void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); +-extern(Windows) void /*APIENTRY*/glShadeModel (GLenum mode); +-extern(Windows) void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref, GLuint mask); +-extern(Windows) void /*APIENTRY*/glStencilMask (GLuint mask); +-extern(Windows) void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); +-extern(Windows) void /*APIENTRY*/glTexCoord1d (GLdouble s); +-extern(Windows) void /*APIENTRY*/glTexCoord1dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glTexCoord1f (GLfloat s); +-extern(Windows) void /*APIENTRY*/glTexCoord1fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glTexCoord1i (GLint s); +-extern(Windows) void /*APIENTRY*/glTexCoord1iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glTexCoord1s (GLshort s); +-extern(Windows) void /*APIENTRY*/glTexCoord1sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); +-extern(Windows) void /*APIENTRY*/glTexCoord2dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); +-extern(Windows) void /*APIENTRY*/glTexCoord2fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); +-extern(Windows) void /*APIENTRY*/glTexCoord2iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); +-extern(Windows) void /*APIENTRY*/glTexCoord2sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); +-extern(Windows) void /*APIENTRY*/glTexCoord3dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); +-extern(Windows) void /*APIENTRY*/glTexCoord3fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); +-extern(Windows) void /*APIENTRY*/glTexCoord3iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); +-extern(Windows) void /*APIENTRY*/glTexCoord3sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); +-extern(Windows) void /*APIENTRY*/glTexCoord4dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); +-extern(Windows) void /*APIENTRY*/glTexCoord4fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); +-extern(Windows) void /*APIENTRY*/glTexCoord4iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); +-extern(Windows) void /*APIENTRY*/glTexCoord4sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); +-extern(Windows) void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); +-extern(Windows) void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); +-extern(Windows) void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); +-extern(Windows) void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); +-extern(Windows) void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); +-extern(Windows) void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); +-extern(Windows) void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); +-extern(Windows) void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); +-extern(Windows) void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); +-extern(Windows) void /*APIENTRY*/glVertex2dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); +-extern(Windows) void /*APIENTRY*/glVertex2fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glVertex2i (GLint x, GLint y); +-extern(Windows) void /*APIENTRY*/glVertex2iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); +-extern(Windows) void /*APIENTRY*/glVertex2sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); +-extern(Windows) void /*APIENTRY*/glVertex3dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); +-extern(Windows) void /*APIENTRY*/glVertex3fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); +-extern(Windows) void /*APIENTRY*/glVertex3iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); +-extern(Windows) void /*APIENTRY*/glVertex3sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); +-extern(Windows) void /*APIENTRY*/glVertex4dv (GLdouble *v); +-extern(Windows) void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); +-extern(Windows) void /*APIENTRY*/glVertex4fv (GLfloat *v); +-extern(Windows) void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); +-extern(Windows) void /*APIENTRY*/glVertex4iv (GLint *v); +-extern(Windows) void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); +-extern(Windows) void /*APIENTRY*/glVertex4sv (GLshort *v); +-extern(Windows) void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); +-extern(Windows) void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); +- ++void /*APIENTRY*/glAccum (GLenum op, GLfloat value); ++void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_); ++GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences); ++void /*APIENTRY*/glArrayElement (GLint i); ++void /*APIENTRY*/glBegin (GLenum mode); ++void /*APIENTRY*/glBindTexture (GLenum target, GLuint texture); ++void /*APIENTRY*/glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, GLubyte *bitmap); ++void /*APIENTRY*/glBlendFunc (GLenum sfactor, GLenum dfactor); ++void /*APIENTRY*/glCallList (GLuint list); ++void /*APIENTRY*/glCallLists (GLsizei n, GLenum type, GLvoid *lists); ++void /*APIENTRY*/glClear (GLbitfield mask); ++void /*APIENTRY*/glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); ++void /*APIENTRY*/glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); ++void /*APIENTRY*/glClearDepth (GLclampd depth); ++void /*APIENTRY*/glClearIndex (GLfloat c); ++void /*APIENTRY*/glClearStencil (GLint s); ++void /*APIENTRY*/glClipPlane (GLenum plane, GLdouble *equation); ++void /*APIENTRY*/glColor3b (GLbyte red, GLbyte green, GLbyte blue); ++void /*APIENTRY*/glColor3bv (GLbyte *v); ++void /*APIENTRY*/glColor3d (GLdouble red, GLdouble green, GLdouble blue); ++void /*APIENTRY*/glColor3dv (GLdouble *v); ++void /*APIENTRY*/glColor3f (GLfloat red, GLfloat green, GLfloat blue); ++void /*APIENTRY*/glColor3fv (GLfloat *v); ++void /*APIENTRY*/glColor3i (GLint red, GLint green, GLint blue); ++void /*APIENTRY*/glColor3iv (GLint *v); ++void /*APIENTRY*/glColor3s (GLshort red, GLshort green, GLshort blue); ++void /*APIENTRY*/glColor3sv (GLshort *v); ++void /*APIENTRY*/glColor3ub (GLubyte red, GLubyte green, GLubyte blue); ++void /*APIENTRY*/glColor3ubv (GLubyte *v); ++void /*APIENTRY*/glColor3ui (GLuint red, GLuint green, GLuint blue); ++void /*APIENTRY*/glColor3uiv (GLuint *v); ++void /*APIENTRY*/glColor3us (GLushort red, GLushort green, GLushort blue); ++void /*APIENTRY*/glColor3usv (GLushort *v); ++void /*APIENTRY*/glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); ++void /*APIENTRY*/glColor4bv (GLbyte *v); ++void /*APIENTRY*/glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); ++void /*APIENTRY*/glColor4dv (GLdouble *v); ++void /*APIENTRY*/glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); ++void /*APIENTRY*/glColor4fv (GLfloat *v); ++void /*APIENTRY*/glColor4i (GLint red, GLint green, GLint blue, GLint alpha); ++void /*APIENTRY*/glColor4iv (GLint *v); ++void /*APIENTRY*/glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); ++void /*APIENTRY*/glColor4sv (GLshort *v); ++void /*APIENTRY*/glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); ++void /*APIENTRY*/glColor4ubv (GLubyte *v); ++void /*APIENTRY*/glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); ++void /*APIENTRY*/glColor4uiv (GLuint *v); ++void /*APIENTRY*/glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); ++void /*APIENTRY*/glColor4usv (GLushort *v); ++void /*APIENTRY*/glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); ++void /*APIENTRY*/glColorMaterial (GLenum face, GLenum mode); ++void /*APIENTRY*/glColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); ++void /*APIENTRY*/glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); ++void /*APIENTRY*/glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); ++void /*APIENTRY*/glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); ++void /*APIENTRY*/glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); ++void /*APIENTRY*/glCullFace (GLenum mode); ++void /*APIENTRY*/glDeleteLists (GLuint list, GLsizei range); ++void /*APIENTRY*/glDeleteTextures (GLsizei n, GLuint *textures); ++void /*APIENTRY*/glDepthFunc (GLenum func); ++void /*APIENTRY*/glDepthMask (GLboolean flag); ++void /*APIENTRY*/glDepthRange (GLclampd zNear, GLclampd zFar); ++void /*APIENTRY*/glDisable (GLenum cap); ++void /*APIENTRY*/glDisableClientState (GLenum array); ++void /*APIENTRY*/glDrawArrays (GLenum mode, GLint first, GLsizei count); ++void /*APIENTRY*/glDrawBuffer (GLenum mode); ++void /*APIENTRY*/glDrawElements (GLenum mode, GLsizei count, GLenum type, GLvoid *indices); ++void /*APIENTRY*/glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glEdgeFlag (GLboolean flag); ++void /*APIENTRY*/glEdgeFlagPointer (GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glEdgeFlagv (GLboolean *flag); ++void /*APIENTRY*/glEnable (GLenum cap); ++void /*APIENTRY*/glEnableClientState (GLenum array); ++void /*APIENTRY*/glEnd (); ++void /*APIENTRY*/glEndList (); ++void /*APIENTRY*/glEvalCoord1d (GLdouble u); ++void /*APIENTRY*/glEvalCoord1dv (GLdouble *u); ++void /*APIENTRY*/glEvalCoord1f (GLfloat u); ++void /*APIENTRY*/glEvalCoord1fv (GLfloat *u); ++void /*APIENTRY*/glEvalCoord2d (GLdouble u, GLdouble v); ++void /*APIENTRY*/glEvalCoord2dv (GLdouble *u); ++void /*APIENTRY*/glEvalCoord2f (GLfloat u, GLfloat v); ++void /*APIENTRY*/glEvalCoord2fv (GLfloat *u); ++void /*APIENTRY*/glEvalMesh1 (GLenum mode, GLint i1, GLint i2); ++void /*APIENTRY*/glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); ++void /*APIENTRY*/glEvalPoint1 (GLint i); ++void /*APIENTRY*/glEvalPoint2 (GLint i, GLint j); ++void /*APIENTRY*/glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); ++void /*APIENTRY*/glFinish (); ++void /*APIENTRY*/glFlush (); ++void /*APIENTRY*/glFogf (GLenum pname, GLfloat param); ++void /*APIENTRY*/glFogfv (GLenum pname, GLfloat *params); ++void /*APIENTRY*/glFogi (GLenum pname, GLint param); ++void /*APIENTRY*/glFogiv (GLenum pname, GLint *params); ++void /*APIENTRY*/glFrontFace (GLenum mode); ++void /*APIENTRY*/glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); ++GLuint /*APIENTRY*/glGenLists (GLsizei range); ++void /*APIENTRY*/glGenTextures (GLsizei n, GLuint *textures); ++void /*APIENTRY*/glGetBooleanv (GLenum pname, GLboolean *params); ++void /*APIENTRY*/glGetClipPlane (GLenum plane, GLdouble *equation); ++void /*APIENTRY*/glGetDoublev (GLenum pname, GLdouble *params); ++GLenum /*APIENTRY*/glGetError (); ++void /*APIENTRY*/glGetFloatv (GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetIntegerv (GLenum pname, GLint *params); ++void /*APIENTRY*/glGetLightfv (GLenum light, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetLightiv (GLenum light, GLenum pname, GLint *params); ++void /*APIENTRY*/glGetMapdv (GLenum target, GLenum query, GLdouble *v); ++void /*APIENTRY*/glGetMapfv (GLenum target, GLenum query, GLfloat *v); ++void /*APIENTRY*/glGetMapiv (GLenum target, GLenum query, GLint *v); ++void /*APIENTRY*/glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetMaterialiv (GLenum face, GLenum pname, GLint *params); ++void /*APIENTRY*/glGetPixelMapfv (GLenum map, GLfloat *values); ++void /*APIENTRY*/glGetPixelMapuiv (GLenum map, GLuint *values); ++void /*APIENTRY*/glGetPixelMapusv (GLenum map, GLushort *values); ++void /*APIENTRY*/glGetPointerv (GLenum pname, GLvoid* *params); ++void /*APIENTRY*/glGetPolygonStipple (GLubyte *mask); ++GLubyte * /*APIENTRY*/glGetString (GLenum name); ++void /*APIENTRY*/glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetTexEnviv (GLenum target, GLenum pname, GLint *params); ++void /*APIENTRY*/glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); ++void /*APIENTRY*/glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); ++void /*APIENTRY*/glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); ++void /*APIENTRY*/glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); ++void /*APIENTRY*/glHint (GLenum target, GLenum mode); ++void /*APIENTRY*/glIndexMask (GLuint mask); ++void /*APIENTRY*/glIndexPointer (GLenum type, GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glIndexd (GLdouble c); ++void /*APIENTRY*/glIndexdv (GLdouble *c); ++void /*APIENTRY*/glIndexf (GLfloat c); ++void /*APIENTRY*/glIndexfv (GLfloat *c); ++void /*APIENTRY*/glIndexi (GLint c); ++void /*APIENTRY*/glIndexiv (GLint *c); ++void /*APIENTRY*/glIndexs (GLshort c); ++void /*APIENTRY*/glIndexsv (GLshort *c); ++void /*APIENTRY*/glIndexub (GLubyte c); ++void /*APIENTRY*/glIndexubv (GLubyte *c); ++void /*APIENTRY*/glInitNames (); ++void /*APIENTRY*/glInterleavedArrays (GLenum format, GLsizei stride, GLvoid *pointer); ++GLboolean /*APIENTRY*/glIsEnabled (GLenum cap); ++GLboolean /*APIENTRY*/glIsList (GLuint list); ++GLboolean /*APIENTRY*/glIsTexture (GLuint texture); ++void /*APIENTRY*/glLightModelf (GLenum pname, GLfloat param); ++void /*APIENTRY*/glLightModelfv (GLenum pname, GLfloat *params); ++void /*APIENTRY*/glLightModeli (GLenum pname, GLint param); ++void /*APIENTRY*/glLightModeliv (GLenum pname, GLint *params); ++void /*APIENTRY*/glLightf (GLenum light, GLenum pname, GLfloat param); ++void /*APIENTRY*/glLightfv (GLenum light, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glLighti (GLenum light, GLenum pname, GLint param); ++void /*APIENTRY*/glLightiv (GLenum light, GLenum pname, GLint *params); ++void /*APIENTRY*/glLineStipple (GLint factor, GLushort pattern); ++void /*APIENTRY*/glLineWidth (GLfloat width); ++void /*APIENTRY*/glListBase (GLuint base); ++void /*APIENTRY*/glLoadIdentity (); ++void /*APIENTRY*/glLoadMatrixd (GLdouble *m); ++void /*APIENTRY*/glLoadMatrixf (GLfloat *m); ++void /*APIENTRY*/glLoadName (GLuint name); ++void /*APIENTRY*/glLogicOp (GLenum opcode); ++void /*APIENTRY*/glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, GLdouble *points); ++void /*APIENTRY*/glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, GLfloat *points); ++void /*APIENTRY*/glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble *points); ++void /*APIENTRY*/glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat *points); ++void /*APIENTRY*/glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); ++void /*APIENTRY*/glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); ++void /*APIENTRY*/glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); ++void /*APIENTRY*/glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); ++void /*APIENTRY*/glMaterialf (GLenum face, GLenum pname, GLfloat param); ++void /*APIENTRY*/glMaterialfv (GLenum face, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glMateriali (GLenum face, GLenum pname, GLint param); ++void /*APIENTRY*/glMaterialiv (GLenum face, GLenum pname, GLint *params); ++void /*APIENTRY*/glMatrixMode (GLenum mode); ++void /*APIENTRY*/glMultMatrixd (GLdouble *m); ++void /*APIENTRY*/glMultMatrixf (GLfloat *m); ++void /*APIENTRY*/glNewList (GLuint list, GLenum mode); ++void /*APIENTRY*/glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); ++void /*APIENTRY*/glNormal3bv (GLbyte *v); ++void /*APIENTRY*/glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); ++void /*APIENTRY*/glNormal3dv (GLdouble *v); ++void /*APIENTRY*/glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); ++void /*APIENTRY*/glNormal3fv (GLfloat *v); ++void /*APIENTRY*/glNormal3i (GLint nx, GLint ny, GLint nz); ++void /*APIENTRY*/glNormal3iv (GLint *v); ++void /*APIENTRY*/glNormal3s (GLshort nx, GLshort ny, GLshort nz); ++void /*APIENTRY*/glNormal3sv (GLshort *v); ++void /*APIENTRY*/glNormalPointer (GLenum type, GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); ++void /*APIENTRY*/glPassThrough (GLfloat token); ++void /*APIENTRY*/glPixelMapfv (GLenum map, GLsizei mapsize, GLfloat *values); ++void /*APIENTRY*/glPixelMapuiv (GLenum map, GLsizei mapsize, GLuint *values); ++void /*APIENTRY*/glPixelMapusv (GLenum map, GLsizei mapsize, GLushort *values); ++void /*APIENTRY*/glPixelStoref (GLenum pname, GLfloat param); ++void /*APIENTRY*/glPixelStorei (GLenum pname, GLint param); ++void /*APIENTRY*/glPixelTransferf (GLenum pname, GLfloat param); ++void /*APIENTRY*/glPixelTransferi (GLenum pname, GLint param); ++void /*APIENTRY*/glPixelZoom (GLfloat xfactor, GLfloat yfactor); ++void /*APIENTRY*/glPointSize (GLfloat size); ++void /*APIENTRY*/glPolygonMode (GLenum face, GLenum mode); ++void /*APIENTRY*/glPolygonOffset (GLfloat factor, GLfloat units); ++void /*APIENTRY*/glPolygonStipple (GLubyte *mask); ++void /*APIENTRY*/glPopAttrib (); ++void /*APIENTRY*/glPopClientAttrib (); ++void /*APIENTRY*/glPopMatrix (); ++void /*APIENTRY*/glPopName (); ++void /*APIENTRY*/glPrioritizeTextures (GLsizei n, GLuint *textures, GLclampf *priorities); ++void /*APIENTRY*/glPushAttrib (GLbitfield mask); ++void /*APIENTRY*/glPushClientAttrib (GLbitfield mask); ++void /*APIENTRY*/glPushMatrix (); ++void /*APIENTRY*/glPushName (GLuint name); ++void /*APIENTRY*/glRasterPos2d (GLdouble x, GLdouble y); ++void /*APIENTRY*/glRasterPos2dv (GLdouble *v); ++void /*APIENTRY*/glRasterPos2f (GLfloat x, GLfloat y); ++void /*APIENTRY*/glRasterPos2fv (GLfloat *v); ++void /*APIENTRY*/glRasterPos2i (GLint x, GLint y); ++void /*APIENTRY*/glRasterPos2iv (GLint *v); ++void /*APIENTRY*/glRasterPos2s (GLshort x, GLshort y); ++void /*APIENTRY*/glRasterPos2sv (GLshort *v); ++void /*APIENTRY*/glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); ++void /*APIENTRY*/glRasterPos3dv (GLdouble *v); ++void /*APIENTRY*/glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); ++void /*APIENTRY*/glRasterPos3fv (GLfloat *v); ++void /*APIENTRY*/glRasterPos3i (GLint x, GLint y, GLint z); ++void /*APIENTRY*/glRasterPos3iv (GLint *v); ++void /*APIENTRY*/glRasterPos3s (GLshort x, GLshort y, GLshort z); ++void /*APIENTRY*/glRasterPos3sv (GLshort *v); ++void /*APIENTRY*/glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); ++void /*APIENTRY*/glRasterPos4dv (GLdouble *v); ++void /*APIENTRY*/glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); ++void /*APIENTRY*/glRasterPos4fv (GLfloat *v); ++void /*APIENTRY*/glRasterPos4i (GLint x, GLint y, GLint z, GLint w); ++void /*APIENTRY*/glRasterPos4iv (GLint *v); ++void /*APIENTRY*/glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); ++void /*APIENTRY*/glRasterPos4sv (GLshort *v); ++void /*APIENTRY*/glReadBuffer (GLenum mode); ++void /*APIENTRY*/glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); ++void /*APIENTRY*/glRectdv (GLdouble *v1, GLdouble *v2); ++void /*APIENTRY*/glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); ++void /*APIENTRY*/glRectfv (GLfloat *v1, GLfloat *v2); ++void /*APIENTRY*/glRecti (GLint x1, GLint y1, GLint x2, GLint y2); ++void /*APIENTRY*/glRectiv (GLint *v1, GLint *v2); ++void /*APIENTRY*/glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); ++void /*APIENTRY*/glRectsv (GLshort *v1, GLshort *v2); ++GLint /*APIENTRY*/glRenderMode (GLenum mode); ++void /*APIENTRY*/glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); ++void /*APIENTRY*/glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); ++void /*APIENTRY*/glScaled (GLdouble x, GLdouble y, GLdouble z); ++void /*APIENTRY*/glScalef (GLfloat x, GLfloat y, GLfloat z); ++void /*APIENTRY*/glScissor (GLint x, GLint y, GLsizei width, GLsizei height); ++void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer); ++void /*APIENTRY*/glShadeModel (GLenum mode); ++void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask); ++void /*APIENTRY*/glStencilMask (GLuint mask); ++void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); ++void /*APIENTRY*/glTexCoord1d (GLdouble s); ++void /*APIENTRY*/glTexCoord1dv (GLdouble *v); ++void /*APIENTRY*/glTexCoord1f (GLfloat s); ++void /*APIENTRY*/glTexCoord1fv (GLfloat *v); ++void /*APIENTRY*/glTexCoord1i (GLint s); ++void /*APIENTRY*/glTexCoord1iv (GLint *v); ++void /*APIENTRY*/glTexCoord1s (GLshort s); ++void /*APIENTRY*/glTexCoord1sv (GLshort *v); ++void /*APIENTRY*/glTexCoord2d (GLdouble s, GLdouble t); ++void /*APIENTRY*/glTexCoord2dv (GLdouble *v); ++void /*APIENTRY*/glTexCoord2f (GLfloat s, GLfloat t); ++void /*APIENTRY*/glTexCoord2fv (GLfloat *v); ++void /*APIENTRY*/glTexCoord2i (GLint s, GLint t); ++void /*APIENTRY*/glTexCoord2iv (GLint *v); ++void /*APIENTRY*/glTexCoord2s (GLshort s, GLshort t); ++void /*APIENTRY*/glTexCoord2sv (GLshort *v); ++void /*APIENTRY*/glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); ++void /*APIENTRY*/glTexCoord3dv (GLdouble *v); ++void /*APIENTRY*/glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); ++void /*APIENTRY*/glTexCoord3fv (GLfloat *v); ++void /*APIENTRY*/glTexCoord3i (GLint s, GLint t, GLint r); ++void /*APIENTRY*/glTexCoord3iv (GLint *v); ++void /*APIENTRY*/glTexCoord3s (GLshort s, GLshort t, GLshort r); ++void /*APIENTRY*/glTexCoord3sv (GLshort *v); ++void /*APIENTRY*/glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); ++void /*APIENTRY*/glTexCoord4dv (GLdouble *v); ++void /*APIENTRY*/glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); ++void /*APIENTRY*/glTexCoord4fv (GLfloat *v); ++void /*APIENTRY*/glTexCoord4i (GLint s, GLint t, GLint r, GLint q); ++void /*APIENTRY*/glTexCoord4iv (GLint *v); ++void /*APIENTRY*/glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); ++void /*APIENTRY*/glTexCoord4sv (GLshort *v); ++void /*APIENTRY*/glTexCoordPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glTexEnvf (GLenum target, GLenum pname, GLfloat param); ++void /*APIENTRY*/glTexEnvfv (GLenum target, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glTexEnvi (GLenum target, GLenum pname, GLint param); ++void /*APIENTRY*/glTexEnviv (GLenum target, GLenum pname, GLint *params); ++void /*APIENTRY*/glTexGend (GLenum coord, GLenum pname, GLdouble param); ++void /*APIENTRY*/glTexGendv (GLenum coord, GLenum pname, GLdouble *params); ++void /*APIENTRY*/glTexGenf (GLenum coord, GLenum pname, GLfloat param); ++void /*APIENTRY*/glTexGenfv (GLenum coord, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glTexGeni (GLenum coord, GLenum pname, GLint param); ++void /*APIENTRY*/glTexGeniv (GLenum coord, GLenum pname, GLint *params); ++void /*APIENTRY*/glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glTexParameterf (GLenum target, GLenum pname, GLfloat param); ++void /*APIENTRY*/glTexParameterfv (GLenum target, GLenum pname, GLfloat *params); ++void /*APIENTRY*/glTexParameteri (GLenum target, GLenum pname, GLint param); ++void /*APIENTRY*/glTexParameteriv (GLenum target, GLenum pname, GLint *params); ++void /*APIENTRY*/glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); ++void /*APIENTRY*/glTranslated (GLdouble x, GLdouble y, GLdouble z); ++void /*APIENTRY*/glTranslatef (GLfloat x, GLfloat y, GLfloat z); ++void /*APIENTRY*/glVertex2d (GLdouble x, GLdouble y); ++void /*APIENTRY*/glVertex2dv (GLdouble *v); ++void /*APIENTRY*/glVertex2f (GLfloat x, GLfloat y); ++void /*APIENTRY*/glVertex2fv (GLfloat *v); ++void /*APIENTRY*/glVertex2i (GLint x, GLint y); ++void /*APIENTRY*/glVertex2iv (GLint *v); ++void /*APIENTRY*/glVertex2s (GLshort x, GLshort y); ++void /*APIENTRY*/glVertex2sv (GLshort *v); ++void /*APIENTRY*/glVertex3d (GLdouble x, GLdouble y, GLdouble z); ++void /*APIENTRY*/glVertex3dv (GLdouble *v); ++void /*APIENTRY*/glVertex3f (GLfloat x, GLfloat y, GLfloat z); ++void /*APIENTRY*/glVertex3fv (GLfloat *v); ++void /*APIENTRY*/glVertex3i (GLint x, GLint y, GLint z); ++void /*APIENTRY*/glVertex3iv (GLint *v); ++void /*APIENTRY*/glVertex3s (GLshort x, GLshort y, GLshort z); ++void /*APIENTRY*/glVertex3sv (GLshort *v); ++void /*APIENTRY*/glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); ++void /*APIENTRY*/glVertex4dv (GLdouble *v); ++void /*APIENTRY*/glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); ++void /*APIENTRY*/glVertex4fv (GLfloat *v); ++void /*APIENTRY*/glVertex4i (GLint x, GLint y, GLint z, GLint w); ++void /*APIENTRY*/glVertex4iv (GLint *v); ++void /*APIENTRY*/glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); ++void /*APIENTRY*/glVertex4sv (GLshort *v); ++void /*APIENTRY*/glVertexPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer); ++void /*APIENTRY*/glViewport (GLint x, GLint y, GLsizei width, GLsizei height); + +-extern(Windows): + + /* EXT_vertex_array */ +-typedef void (* PFNGLARRAYELEMENTEXTPROC) (GLint i); +-typedef void (* PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); +-typedef void (* PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer); +-typedef void (* PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer); +-typedef void (* PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer); +-typedef void (* PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer); +-typedef void (* PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer); +-typedef void (* PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, GLboolean *pointer); +-typedef void (* PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); +-typedef void (* PFNGLARRAYELEMENTARRAYEXTPROC)(GLenum mode, GLsizei count, GLvoid* pi); ++alias void function(GLint i) PFNGLARRAYELEMENTEXTPROC; ++alias void function(GLenum mode, GLint first, GLsizei count) PFNGLDRAWARRAYSEXTPROC; ++alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLVERTEXPOINTEREXTPROC; ++alias void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLNORMALPOINTEREXTPROC; ++alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLCOLORPOINTEREXTPROC; ++alias void function(GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLINDEXPOINTEREXTPROC; ++alias void function(GLint size, GLenum type, GLsizei stride, GLsizei count, GLvoid *pointer) PFNGLTEXCOORDPOINTEREXTPROC; ++alias void function(GLsizei stride, GLsizei count, GLboolean *pointer) PFNGLEDGEFLAGPOINTEREXTPROC; ++alias void function(GLenum pname, GLvoid* *params) PFNGLGETPOINTERVEXTPROC; ++alias void function(GLenum mode, GLsizei count, GLvoid* pi) PFNGLARRAYELEMENTARRAYEXTPROC; + + /* WIN_draw_range_elements */ +-typedef void (* PFNGLDRAWRANGEELEMENTSWINPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices); ++alias void function(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid *indices) PFNGLDRAWRANGEELEMENTSWINPROC; + + /* WIN_swap_hint */ +-typedef void (* PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height); ++alias void function(GLint x, GLint y, GLsizei width, GLsizei height) PFNGLADDSWAPHINTRECTWINPROC; + + /* EXT_paletted_texture */ +-typedef void (* PFNGLCOLORTABLEEXTPROC) +- (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, +- GLenum type, GLvoid *data); +-typedef void (* PFNGLCOLORSUBTABLEEXTPROC) +- (GLenum target, GLsizei start, GLsizei count, GLenum format, +- GLenum type, GLvoid *data); +-typedef void (* PFNGLGETCOLORTABLEEXTPROC) +- (GLenum target, GLenum format, GLenum type, GLvoid *data); +-typedef void (* PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) +- (GLenum target, GLenum pname, GLint *params); +-typedef void (* PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) +- (GLenum target, GLenum pname, GLfloat *params); ++alias void function(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, ++ GLenum type, GLvoid *data) PFNGLCOLORTABLEEXTPROC; ++alias void function(GLenum target, GLsizei start, GLsizei count, GLenum format, ++ GLenum type, GLvoid *data) PFNGLCOLORSUBTABLEEXTPROC; ++alias void function(GLenum target, GLenum format, GLenum type, GLvoid *data) PFNGLGETCOLORTABLEEXTPROC; ++alias void function(GLenum target, GLenum pname, GLint *params) PFNGLGETCOLORTABLEPARAMETERIVEXTPROC; ++alias void function(GLenum target, GLenum pname, GLfloat *params) PFNGLGETCOLORTABLEPARAMETERFVEXTPROC; + +-import openglu; +\ No newline at end of file ++//import openglu; +--- a/import/openglu.d ++++ b/import/openglu.d +@@ -1,6 +1,6 @@ + import opengl; + +-extern(Windows): ++extern(System): + + GLubyte* gluErrorString ( + GLenum errCode); +@@ -28,7 +28,7 @@ + GLdouble y, + GLdouble width, + GLdouble height, +- GLint[4] viewport); ++ ref GLint[4] viewport); + + void gluLookAt ( + GLdouble eyex, +@@ -45,9 +45,9 @@ + GLdouble objx, + GLdouble objy, + GLdouble objz, +- GLdouble[16] modelMatrix, +- GLdouble[16] projMatrix, +- GLint[4] viewport, ++ ref GLdouble[16] modelMatrix, ++ ref GLdouble[16] projMatrix, ++ ref GLint[4] viewport, + GLdouble *winx, + GLdouble *winy, + GLdouble *winz); +@@ -56,8 +56,8 @@ + GLdouble winx, + GLdouble winy, + GLdouble winz, +- GLdouble[16] modelMatrix, +- GLdouble[16] projMatrix, ++ ref GLdouble[16] modelMatrix, ++ ref GLdouble[16] projMatrix, + GLint[4] viewport, + GLdouble *objx, + GLdouble *objy, +@@ -157,7 +157,7 @@ + void gluQuadricCallback ( + GLUquadric *qobj, + GLenum which, +- void (* fn)()); ++ void function() fn); + + GLUtesselator* gluNewTess( + ); +@@ -174,7 +174,7 @@ + + void gluTessVertex( + GLUtesselator *tess, +- GLdouble[3] coords, ++ ref GLdouble[3] coords, + void *data ); + + void gluTessEndContour( +@@ -197,7 +197,7 @@ + void gluTessCallback( + GLUtesselator *tess, + GLenum which, +- void ( *fn)()); ++ void function() fn); + + void gluGetTessProperty( + GLUtesselator *tess, +@@ -260,9 +260,9 @@ + void + gluLoadSamplingMatrices ( + GLUnurbs *nobj, +- GLfloat[16] modelMatrix, +- GLfloat[16] projMatrix, +- GLint[4] viewport ); ++ ref GLfloat[16] modelMatrix, ++ ref GLfloat[16] projMatrix, ++ ref GLint[4] viewport ); + + void + gluNurbsProperty ( +@@ -280,37 +280,37 @@ + gluNurbsCallback ( + GLUnurbs *nobj, + GLenum which, +- void (* fn)() ); ++ void function() fn ); + + + /**** function prototypes ****/ + + /* gluQuadricCallback */ +-typedef void (* GLUquadricErrorProc) (GLenum); ++alias void function(GLenum) GLUquadricErrorProc; + + /* gluTessCallback */ +-typedef void (* GLUtessBeginProc) (GLenum); +-typedef void (* GLUtessEdgeFlagProc) (GLboolean); +-typedef void (* GLUtessVertexProc) (void *); +-typedef void (* GLUtessEndProc) (); +-typedef void (* GLUtessErrorProc) (GLenum); +-typedef void (* GLUtessCombineProc) (GLdouble[3], +- void*[4], +- GLfloat[4], +- void** ); +-typedef void (* GLUtessBeginDataProc) (GLenum, void *); +-typedef void (* GLUtessEdgeFlagDataProc) (GLboolean, void *); +-typedef void (* GLUtessVertexDataProc) (void *, void *); +-typedef void (* GLUtessEndDataProc) (void *); +-typedef void (* GLUtessErrorDataProc) (GLenum, void *); +-typedef void (* GLUtessCombineDataProc) (GLdouble[3], +- void*[4], +- GLfloat[4], +- void**, +- void* ); ++alias void function(GLenum) GLUtessBeginProc; ++alias void function(GLboolean) GLUtessEdgeFlagProc; ++alias void function(void *) GLUtessVertexProc; ++alias void function() GLUtessEndProc; ++alias void function(GLenum) GLUtessErrorProc; ++alias void function(ref GLdouble[3], ++ ref void*[4], ++ ref GLfloat[4], ++ void**) GLUtessCombineProc; ++alias void function(GLenum, void *) GLUtessBeginDataProc; ++alias void function(GLboolean, void *) GLUtessEdgeFlagDataProc; ++alias void function(void *, void *) GLUtessVertexDataProc; ++alias void function(void *) GLUtessEndDataProc; ++alias void function(GLenum, void *) GLUtessErrorDataProc; ++alias void function(ref GLdouble[3], ++ ref void*[4], ++ ref GLfloat[4], ++ void**, ++ void*) GLUtessCombineDataProc; + + /* gluNurbsCallback */ +-typedef void (* GLUnurbsErrorProc) (GLenum); ++alias void function(GLenum) GLUnurbsErrorProc; + + + /**** Generic constants ****/ +@@ -357,7 +357,6 @@ + + /**** Tesselation constants ****/ + +-//const extended GLU_TESS_MAX_COORD = 1.0e150; + const real GLU_TESS_MAX_COORD = 1.0e150; + + /* TessProperty */ +--- /dev/null ++++ b/import/SDL_keysym_.d +@@ -0,0 +1,308 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Lantinga ++ slouken@devolution.com ++*/ ++ ++/* What we really want is a mapping of every raw key on the keyboard. ++ To support international keyboards, we use the range 0xA1 - 0xFF ++ as international virtual keycodes. We'll follow in the footsteps of X11... ++ The names of the keys ++ */ ++ ++alias int SDLKey; ++enum { ++ /* The keyboard syms have been cleverly chosen to map to ASCII */ ++ SDLK_UNKNOWN = 0, ++ SDLK_FIRST = 0, ++ SDLK_BACKSPACE = 8, ++ SDLK_TAB = 9, ++ SDLK_CLEAR = 12, ++ SDLK_RETURN = 13, ++ SDLK_PAUSE = 19, ++ SDLK_ESCAPE = 27, ++ SDLK_SPACE = 32, ++ SDLK_EXCLAIM = 33, ++ SDLK_QUOTEDBL = 34, ++ SDLK_HASH = 35, ++ SDLK_DOLLAR = 36, ++ SDLK_AMPERSAND = 38, ++ SDLK_QUOTE = 39, ++ SDLK_LEFTPAREN = 40, ++ SDLK_RIGHTPAREN = 41, ++ SDLK_ASTERISK = 42, ++ SDLK_PLUS = 43, ++ SDLK_COMMA = 44, ++ SDLK_MINUS = 45, ++ SDLK_PERIOD = 46, ++ SDLK_SLASH = 47, ++ SDLK_0 = 48, ++ SDLK_1 = 49, ++ SDLK_2 = 50, ++ SDLK_3 = 51, ++ SDLK_4 = 52, ++ SDLK_5 = 53, ++ SDLK_6 = 54, ++ SDLK_7 = 55, ++ SDLK_8 = 56, ++ SDLK_9 = 57, ++ SDLK_COLON = 58, ++ SDLK_SEMICOLON = 59, ++ SDLK_LESS = 60, ++ SDLK_EQUALS = 61, ++ SDLK_GREATER = 62, ++ SDLK_QUESTION = 63, ++ SDLK_AT = 64, ++ /* ++ Skip uppercase letters ++ */ ++ SDLK_LEFTBRACKET = 91, ++ SDLK_BACKSLASH = 92, ++ SDLK_RIGHTBRACKET = 93, ++ SDLK_CARET = 94, ++ SDLK_UNDERSCORE = 95, ++ SDLK_BACKQUOTE = 96, ++ SDLK_a = 97, ++ SDLK_b = 98, ++ SDLK_c = 99, ++ SDLK_d = 100, ++ SDLK_e = 101, ++ SDLK_f = 102, ++ SDLK_g = 103, ++ SDLK_h = 104, ++ SDLK_i = 105, ++ SDLK_j = 106, ++ SDLK_k = 107, ++ SDLK_l = 108, ++ SDLK_m = 109, ++ SDLK_n = 110, ++ SDLK_o = 111, ++ SDLK_p = 112, ++ SDLK_q = 113, ++ SDLK_r = 114, ++ SDLK_s = 115, ++ SDLK_t = 116, ++ SDLK_u = 117, ++ SDLK_v = 118, ++ SDLK_w = 119, ++ SDLK_x = 120, ++ SDLK_y = 121, ++ SDLK_z = 122, ++ SDLK_DELETE = 127, ++ /* End of ASCII mapped keysyms */ ++ ++ /* International keyboard syms */ ++ SDLK_WORLD_0 = 160, /* 0xA0 */ ++ SDLK_WORLD_1 = 161, ++ SDLK_WORLD_2 = 162, ++ SDLK_WORLD_3 = 163, ++ SDLK_WORLD_4 = 164, ++ SDLK_WORLD_5 = 165, ++ SDLK_WORLD_6 = 166, ++ SDLK_WORLD_7 = 167, ++ SDLK_WORLD_8 = 168, ++ SDLK_WORLD_9 = 169, ++ SDLK_WORLD_10 = 170, ++ SDLK_WORLD_11 = 171, ++ SDLK_WORLD_12 = 172, ++ SDLK_WORLD_13 = 173, ++ SDLK_WORLD_14 = 174, ++ SDLK_WORLD_15 = 175, ++ SDLK_WORLD_16 = 176, ++ SDLK_WORLD_17 = 177, ++ SDLK_WORLD_18 = 178, ++ SDLK_WORLD_19 = 179, ++ SDLK_WORLD_20 = 180, ++ SDLK_WORLD_21 = 181, ++ SDLK_WORLD_22 = 182, ++ SDLK_WORLD_23 = 183, ++ SDLK_WORLD_24 = 184, ++ SDLK_WORLD_25 = 185, ++ SDLK_WORLD_26 = 186, ++ SDLK_WORLD_27 = 187, ++ SDLK_WORLD_28 = 188, ++ SDLK_WORLD_29 = 189, ++ SDLK_WORLD_30 = 190, ++ SDLK_WORLD_31 = 191, ++ SDLK_WORLD_32 = 192, ++ SDLK_WORLD_33 = 193, ++ SDLK_WORLD_34 = 194, ++ SDLK_WORLD_35 = 195, ++ SDLK_WORLD_36 = 196, ++ SDLK_WORLD_37 = 197, ++ SDLK_WORLD_38 = 198, ++ SDLK_WORLD_39 = 199, ++ SDLK_WORLD_40 = 200, ++ SDLK_WORLD_41 = 201, ++ SDLK_WORLD_42 = 202, ++ SDLK_WORLD_43 = 203, ++ SDLK_WORLD_44 = 204, ++ SDLK_WORLD_45 = 205, ++ SDLK_WORLD_46 = 206, ++ SDLK_WORLD_47 = 207, ++ SDLK_WORLD_48 = 208, ++ SDLK_WORLD_49 = 209, ++ SDLK_WORLD_50 = 210, ++ SDLK_WORLD_51 = 211, ++ SDLK_WORLD_52 = 212, ++ SDLK_WORLD_53 = 213, ++ SDLK_WORLD_54 = 214, ++ SDLK_WORLD_55 = 215, ++ SDLK_WORLD_56 = 216, ++ SDLK_WORLD_57 = 217, ++ SDLK_WORLD_58 = 218, ++ SDLK_WORLD_59 = 219, ++ SDLK_WORLD_60 = 220, ++ SDLK_WORLD_61 = 221, ++ SDLK_WORLD_62 = 222, ++ SDLK_WORLD_63 = 223, ++ SDLK_WORLD_64 = 224, ++ SDLK_WORLD_65 = 225, ++ SDLK_WORLD_66 = 226, ++ SDLK_WORLD_67 = 227, ++ SDLK_WORLD_68 = 228, ++ SDLK_WORLD_69 = 229, ++ SDLK_WORLD_70 = 230, ++ SDLK_WORLD_71 = 231, ++ SDLK_WORLD_72 = 232, ++ SDLK_WORLD_73 = 233, ++ SDLK_WORLD_74 = 234, ++ SDLK_WORLD_75 = 235, ++ SDLK_WORLD_76 = 236, ++ SDLK_WORLD_77 = 237, ++ SDLK_WORLD_78 = 238, ++ SDLK_WORLD_79 = 239, ++ SDLK_WORLD_80 = 240, ++ SDLK_WORLD_81 = 241, ++ SDLK_WORLD_82 = 242, ++ SDLK_WORLD_83 = 243, ++ SDLK_WORLD_84 = 244, ++ SDLK_WORLD_85 = 245, ++ SDLK_WORLD_86 = 246, ++ SDLK_WORLD_87 = 247, ++ SDLK_WORLD_88 = 248, ++ SDLK_WORLD_89 = 249, ++ SDLK_WORLD_90 = 250, ++ SDLK_WORLD_91 = 251, ++ SDLK_WORLD_92 = 252, ++ SDLK_WORLD_93 = 253, ++ SDLK_WORLD_94 = 254, ++ SDLK_WORLD_95 = 255, /* 0xFF */ ++ ++ /* Numeric keypad */ ++ SDLK_KP0 = 256, ++ SDLK_KP1 = 257, ++ SDLK_KP2 = 258, ++ SDLK_KP3 = 259, ++ SDLK_KP4 = 260, ++ SDLK_KP5 = 261, ++ SDLK_KP6 = 262, ++ SDLK_KP7 = 263, ++ SDLK_KP8 = 264, ++ SDLK_KP9 = 265, ++ SDLK_KP_PERIOD = 266, ++ SDLK_KP_DIVIDE = 267, ++ SDLK_KP_MULTIPLY = 268, ++ SDLK_KP_MINUS = 269, ++ SDLK_KP_PLUS = 270, ++ SDLK_KP_ENTER = 271, ++ SDLK_KP_EQUALS = 272, ++ ++ /* Arrows + Home/End pad */ ++ SDLK_UP = 273, ++ SDLK_DOWN = 274, ++ SDLK_RIGHT = 275, ++ SDLK_LEFT = 276, ++ SDLK_INSERT = 277, ++ SDLK_HOME = 278, ++ SDLK_END = 279, ++ SDLK_PAGEUP = 280, ++ SDLK_PAGEDOWN = 281, ++ ++ /* Function keys */ ++ SDLK_F1 = 282, ++ SDLK_F2 = 283, ++ SDLK_F3 = 284, ++ SDLK_F4 = 285, ++ SDLK_F5 = 286, ++ SDLK_F6 = 287, ++ SDLK_F7 = 288, ++ SDLK_F8 = 289, ++ SDLK_F9 = 290, ++ SDLK_F10 = 291, ++ SDLK_F11 = 292, ++ SDLK_F12 = 293, ++ SDLK_F13 = 294, ++ SDLK_F14 = 295, ++ SDLK_F15 = 296, ++ ++ /* Key state modifier keys */ ++ SDLK_NUMLOCK = 300, ++ SDLK_CAPSLOCK = 301, ++ SDLK_SCROLLOCK = 302, ++ SDLK_RSHIFT = 303, ++ SDLK_LSHIFT = 304, ++ SDLK_RCTRL = 305, ++ SDLK_LCTRL = 306, ++ SDLK_RALT = 307, ++ SDLK_LALT = 308, ++ SDLK_RMETA = 309, ++ SDLK_LMETA = 310, ++ SDLK_LSUPER = 311, /* Left "Windows" key */ ++ SDLK_RSUPER = 312, /* Right "Windows" key */ ++ SDLK_MODE = 313, /* "Alt Gr" key */ ++ SDLK_COMPOSE = 314, /* Multi-key compose key */ ++ ++ /* Miscellaneous function keys */ ++ SDLK_HELP = 315, ++ SDLK_PRINT = 316, ++ SDLK_SYSREQ = 317, ++ SDLK_BREAK = 318, ++ SDLK_MENU = 319, ++ SDLK_POWER = 320, /* Power Macintosh power key */ ++ SDLK_EURO = 321, /* Some european keyboards */ ++ SDLK_UNDO = 322, /* Atari keyboard has Undo */ ++ ++ /* Add any other keys here */ ++ ++ SDLK_LAST ++} ++ ++/* Enumeration of valid key mods (possibly OR'd together) */ ++alias int SDLMod; ++enum { ++ KMOD_NONE = 0x0000, ++ KMOD_LSHIFT= 0x0001, ++ KMOD_RSHIFT= 0x0002, ++ KMOD_LCTRL = 0x0040, ++ KMOD_RCTRL = 0x0080, ++ KMOD_LALT = 0x0100, ++ KMOD_RALT = 0x0200, ++ KMOD_LMETA = 0x0400, ++ KMOD_RMETA = 0x0800, ++ KMOD_NUM = 0x1000, ++ KMOD_CAPS = 0x2000, ++ KMOD_MODE = 0x4000, ++ KMOD_RESERVED = 0x8000 ++} ++ ++const uint KMOD_CTRL = (KMOD_LCTRL|KMOD_RCTRL); ++const uint KMOD_SHIFT = (KMOD_LSHIFT|KMOD_RSHIFT); ++const uint KMOD_ALT = (KMOD_LALT|KMOD_RALT); ++const uint KMOD_META = (KMOD_LMETA|KMOD_RMETA); +--- /dev/null ++++ b/import/SDL_version_.d +@@ -0,0 +1,75 @@ ++/* ++ SDL - Simple DirectMedia Layer ++ Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Library General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library General Public ++ License along with this library; if not, write to the Free ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++ Sam Lantinga ++ slouken@devolution.com ++*/ ++ ++/* This header defines the current SDL version */ ++ ++import SDL_types; ++ ++extern(C): ++ ++/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL ++*/ ++const uint SDL_MAJOR_VERSION = 1; ++const uint SDL_MINOR_VERSION = 2; ++const uint SDL_PATCHLEVEL = 6; ++ ++struct SDL_version { ++ Uint8 major; ++ Uint8 minor; ++ Uint8 patch; ++} ++ ++/* This macro can be used to fill a version structure with the compile-time ++ * version of the SDL library. ++ */ ++void SDL_VERSION(SDL_version* X) ++{ ++ X.major = SDL_MAJOR_VERSION; ++ X.minor = SDL_MINOR_VERSION; ++ X.patch = SDL_PATCHLEVEL; ++} ++ ++/* This macro turns the version numbers into a numeric value: ++ (1,2,3) -> (1203) ++ This assumes that there will never be more than 100 patchlevels ++*/ ++uint SDL_VERSIONNUM(Uint8 X, Uint8 Y, Uint8 Z) ++{ ++ return X * 1000 + Y * 100 + Z; ++} ++ ++/* This is the version number macro for the current SDL version */ ++const uint SDL_COMPILEDVERSION = SDL_MAJOR_VERSION * 1000 + ++ SDL_MINOR_VERSION * 100 + ++ SDL_PATCHLEVEL; ++ ++/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */ ++bool SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z) ++{ ++ return (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)); ++} ++ ++/* This function gets the version of the dynamically linked SDL library. ++ it should NOT be used to fill a version structure, instead you should ++ use the SDL_Version() macro. ++ */ ++SDL_version * SDL_Linked_Version(); +--- a/import/SDL_version.d ++++ /dev/null +@@ -1,75 +0,0 @@ +-/* +- SDL - Simple DirectMedia Layer +- Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public +- License along with this library; if not, write to the Free +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- +- Sam Lantinga +- slouken@devolution.com +-*/ +- +-/* This header defines the current SDL version */ +- +-import SDL_types; +- +-extern(C): +- +-/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL +-*/ +-const uint SDL_MAJOR_VERSION = 1; +-const uint SDL_MINOR_VERSION = 2; +-const uint SDL_PATCHLEVEL = 3; +- +-struct SDL_version { +- Uint8 major; +- Uint8 minor; +- Uint8 patch; +-} +- +-/* This macro can be used to fill a version structure with the compile-time +- * version of the SDL library. +- */ +-void SDL_VERSION(SDL_version* X) +-{ +- X.major = SDL_MAJOR_VERSION; +- X.minor = SDL_MINOR_VERSION; +- X.patch = SDL_PATCHLEVEL; +-} +- +-/* This macro turns the version numbers into a numeric value: +- (1,2,3) -> (1203) +- This assumes that there will never be more than 100 patchlevels +-*/ +-uint SDL_VERSIONNUM(Uint8 X, Uint8 Y, Uint8 Z) +-{ +- return X * 1000 + Y * 100 + Z; +-} +- +-/* This is the version number macro for the current SDL version */ +-const uint SDL_COMPILEDVERSION = SDL_MAJOR_VERSION * 1000 + +- SDL_MINOR_VERSION * 100 + +- SDL_PATCHLEVEL; +- +-/* This macro will evaluate to true if compiled with SDL at least X.Y.Z */ +-bit SDL_VERSION_ATLEAST(Uint8 X, Uint8 Y, Uint8 Z) +-{ +- return (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)); +-} +- +-/* This function gets the version of the dynamically linked SDL library. +- it should NOT be used to fill a version structure, instead you should +- use the SDL_Version() macro. +- */ +-SDL_version * SDL_Linked_Version(); diff -Nru a7xpg-0.11.dfsg1/debian/patches/makefile.patch a7xpg-0.11.dfsg1/debian/patches/makefile.patch --- a7xpg-0.11.dfsg1/debian/patches/makefile.patch 2012-01-05 17:12:45.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/makefile.patch 2013-06-30 09:51:39.000000000 +0000 @@ -1,45 +1,17 @@ # Copyright (C) 2007 Miriam Ruiz # Distributed under the same license as the game. See debian/copyright. -Index: a7xpg-0.11.dfsg1/Makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ a7xpg-0.11.dfsg1/Makefile 2007-08-29 17:32:50.000000000 +0000 -@@ -0,0 +1,37 @@ -+ -+SOURCES=$(shell find src -name "*.d") -+OBJS=$(SOURCES:.d=.o) -+LSOURCES=$(shell find import -name "*.d") -+LOBJS=$(LSOURCES:.d=.o) -+CSOURCES=$(shell find src -name "*.c") -+COBJS=$(CSOURCES:.c=.o) -+ -+LDFLAGS= -+CFLAGS=-O2 -Wall -+DFLAGS=-O -release -+#DFLAGS=-g -debug -+CC=gcc -+DC=gdmd-v1 -+LIBS=-lGL `sdl-config --libs` -lSDL_mixer +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,11 @@ ++GDC=gdc ++DSRC=$(shell find import src/abagames -name "*.d" | sort) +EXE=a7xpg + +all: $(EXE) + -+$(EXE): $(LOBJS) $(OBJS) $(COBJS) -+ gdc-v1 $(LDFLAGS) -o $@ $+ $(LIBS) -+ -+$(LOBJS): %.o: %.d -+ $(DC) -d -c -of$@ $(DFLAGS) -Iimport $< -+ -+$(OBJS): %.o: %.d -+ $(DC) -d -c -of$@ $(DFLAGS) -Iimport -Isrc $< -+ -+$(COBJS): %.o: %.c -+ $(CC) -c -o $@ $(CFLAGS) `sdl-config --cflags` $< ++$(EXE): $(DSRC) ++ $(GDC) -o $@ -Iimport -Isrc -Wno-deprecated $(DFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DSRC) -lSDL -lGL -lSDL_mixer + +clean: -+ $(RM) -f src/*.o -+ $(RM) -f src/abagames/a7xpg/*.o -+ $(RM) -f src/abagames/util/*.o -+ $(RM) -f src/abagames/util/sdl/*.o -+ $(RM) -f import/*.o ++ rm -f $(EXE) diff -Nru a7xpg-0.11.dfsg1/debian/patches/remove_windows_code.diff a7xpg-0.11.dfsg1/debian/patches/remove_windows_code.diff --- a7xpg-0.11.dfsg1/debian/patches/remove_windows_code.diff 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/remove_windows_code.diff 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1,63 @@ +# Copyright (C) 2007 Peter De Wachter +# Distributed under the same license as the game. See debian/copyright. + +Sat Aug 25 23:57:31 CEST 2007 pdewacht@gmail.com + * 05_remove_windows_code +diff -rN -u old-a7xpg/src/abagames/a7xpg/A7xBoot.d new-a7xpg/src/abagames/a7xpg/A7xBoot.d +--- old-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:10.000000000 +0200 ++++ new-a7xpg/src/abagames/a7xpg/A7xBoot.d 2007-08-26 00:03:10.000000000 +0200 +@@ -29,8 +29,7 @@ + } + + private void parseArgs(char[][] args) { +- //for (int i = 1; i < argv.length; i++) { +- for (int i = 0; i < args.length; i++) { ++ for (int i = 1; i < args.length; i++) { + switch (args[i]) { + case "-brightness": + if (i >= args.length - 1) { +@@ -77,9 +76,7 @@ + } + } + +-//public int main(char[][] argc) { +-private int boot(char[] argl) { +- char[][] args = split(argl); ++public int main(char[][] args) { + screen = new A7xScreen; + input = new Input; + try { +@@ -92,32 +89,3 @@ + mainLoop.loop(); + return EXIT_SUCCESS; + } +- +-// Boot as the windows executable. +-import windows; +- +-extern (C) void gc_init(); +-extern (C) void gc_term(); +-extern (C) void _minit(); +-extern (C) void _moduleCtor(); +- +-extern (Windows) +-int WinMain(HINSTANCE hInstance, +- HINSTANCE hPrevInstance, +- LPSTR lpCmdLine, +- int nCmdShow) { +- int result; +- +- gc_init(); +- _minit(); +- try { +- _moduleCtor(); +- result = boot(string.toString(lpCmdLine)); +- } catch (Object o) { +- MessageBoxA(null, (char *)o.toString(), "Error", +- MB_OK | MB_ICONEXCLAMATION); +- result = 0; +- } +- gc_term(); +- return result; +-} + diff -Nru a7xpg-0.11.dfsg1/debian/patches/series a7xpg-0.11.dfsg1/debian/patches/series --- a7xpg-0.11.dfsg1/debian/patches/series 2011-02-09 21:44:50.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/series 2013-06-30 09:51:39.000000000 +0000 @@ -1,15 +1,11 @@ +imports.patch start_game_string.patch -01_port_opengl_headers.diff -02_sdl_import_remove_windows_code.diff -03_sdl_import_fix_weird_sdl_keysym_problem.diff -04_sdl_import_d_language_updates.diff -05_remove_windows_code.diff -06_d_language_changes.diff -07_store_prefs_in_home_dir.diff -08_adapt_build_file_to_linux_gdc.diff +remove_windows_code.diff +d_language_changes.diff +store_prefs_in_home_dir.diff directories.patch windowed.patch makefile.patch window-resizing.patch allow-sound-init-to-fail.patch -d1.043.patch +dlang_v2.patch diff -Nru a7xpg-0.11.dfsg1/debian/patches/store_prefs_in_home_dir.diff a7xpg-0.11.dfsg1/debian/patches/store_prefs_in_home_dir.diff --- a7xpg-0.11.dfsg1/debian/patches/store_prefs_in_home_dir.diff 1970-01-01 00:00:00.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/patches/store_prefs_in_home_dir.diff 2013-06-30 09:51:39.000000000 +0000 @@ -0,0 +1,57 @@ +# Copyright (C) 2007 Peter De Wachter +# Distributed under the same license as the game. See debian/copyright. + +Sun Aug 26 00:00:45 CEST 2007 pdewacht@gmail.com + * 07_store_prefs_in_home_dir +Index: a7xpg_0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d +=================================================================== +--- a7xpg_0.11.dfsg1.orig/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 23:45:46.000000000 +0200 ++++ a7xpg_0.11.dfsg1/src/abagames/a7xpg/A7xPrefManager.d 2007-08-26 23:47:15.000000000 +0200 +@@ -5,7 +5,9 @@ + */ + module abagames.a7xpg.A7xPrefManager; + +-import stream; ++import std.stream; ++import std.c.stdlib; ++import std.string; + import abagames.util.PrefManager; + + /** +@@ -14,18 +16,25 @@ + public class A7xPrefManager: PrefManager { + public: + static const int VERSION_NUM = 10; +- static const char[] PREF_FILE = "a7xpg.prf"; ++ static const char[] PREF_FILE = ".a7xpg.prf"; + int hiScore; + + private void init() { + hiScore = 0; + } + ++ public char[] pref_file() { ++ char * home = getenv("HOME"); ++ if (home is null) ++ throw new Error("HOME environment variable is not defined"); ++ return std.string.toString(home) ~ "/" ~ PREF_FILE; ++ } ++ + public void load() { + auto File fd = new File; + try { + int ver; +- fd.open(PREF_FILE); ++ fd.open(pref_file()); + fd.read(ver); + if (ver != VERSION_NUM) + throw new Error("Wrong version num"); +@@ -39,7 +48,7 @@ + + public void save() { + auto File fd = new File; +- fd.create(PREF_FILE); ++ fd.create(pref_file()); + fd.write(VERSION_NUM); + fd.write(hiScore); + fd.close(); diff -Nru a7xpg-0.11.dfsg1/debian/rules a7xpg-0.11.dfsg1/debian/rules --- a7xpg-0.11.dfsg1/debian/rules 2012-01-05 17:09:14.000000000 +0000 +++ a7xpg-0.11.dfsg1/debian/rules 2013-06-30 09:51:39.000000000 +0000 @@ -1,73 +1,19 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -CFLAGS = -Wall -g - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 - DFLAGS = -g -debug -d + DFLAGS = -fdebug else - CFLAGS += -O2 - DFLAGS = -O -release -d + DFLAGS = -frelease endif -configure: configure-stamp -configure-stamp: - dh_testdir - touch $@ - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp - - -build-stamp: configure-stamp - dh_testdir - #ant -v - $(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)" - #docbook-to-man debian/a7xpg.sgml > a7xpg.1 - touch $@ -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - #ant -v clean - [ ! -f Makefile ] || $(MAKE) clean - rm -f a7xpg - rm -f `find . -name "*.o"` - dh_clean +%: + dh $@ -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs +override_dh_auto_build: + dh_auto_build -- DFLAGS="$(DFLAGS)" -# Build architecture-independent files here. -binary-indep: build install -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install - dh_installmenu - dh_installman debian/a7xpg.6 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb get-orig-source: dh_testdir @@ -80,6 +26,3 @@ rm a7xpg/resource/*.RES tar cvfz ../a7xpg_0.11.dfsg1.orig.tar.gz a7xpg rm -rf a7xpg.zip a7xpg - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source