Changeset 6608 for lang/d

Timestamp:

02/12/08 23:27:22 (10 months ago)

Author:

itkz

Message:

optimized to DMD 1.020

Location:

lang/d/koke/trunk

Files:

• Makefile (modified) (3 diffs)
• hell2.d (modified) (1 diff)
• opengl.d (modified) (4 diffs)
• opengl_gdc.d (deleted)
• openglu.d (modified) (1 diff)
• openglu_gdc.d (deleted)

lang/d/koke/trunk/Makefile

@@ -3 +3 @@
 CC = gdc
 
-SOURCES=boot.d gamecore.d actor.d character.d clickable.d config.d hell2.d keypad.d map.d opengl_gdc.d openglu_gdc.d state.d vector.d $(wildcard SDL/*.d)
+SOURCES=boot.d gamecore.d actor.d character.d clickable.d config.d hell2.d keypad.d map.d opengl.d openglu.d state.d vector.d $(wildcard SDL/*.d)
 OBJS=$(SOURCES:.d=.o)
 TARGET=koke
@@ -42 +42 @@
 gamecore.o: gamecore.d state.d hell2.d boot.d actor.d vector.d keypad.d clickable.d
 
-hell2.o: hell2.d opengl_gdc.d openglu_gdc.d
+hell2.o: hell2.d opengl.d openglu.d
 
 keypad.o: keypad.d hell2.d
@@ -52 +52 @@
 vector.o: vector.d
 
-opengl_gdc.o: opengl_gdc.d
+opengl.o: opengl.d
 
-openglu_gdc.o: openglu_gdc.d opengl_gdc.d
+openglu.o: openglu.d opengl.d
 
 clean:

lang/d/koke/trunk/hell2.d

@@ -28 +28 @@
 private import SDL;
 private import SDL_mixer;
-version(GDC) {
-        private import opengl_gdc;
-        private import openglu_gdc;
-} else {
-        private import opengl;
-        private import openglu;
-}
+private import opengl;
+private import openglu;
 
 private:

lang/d/koke/trunk/opengl.d

@@ -1 @@
-
-version(Windows) {
+version (Win32) {
+        import std.c.windows.windows;
+}
+extern(System):
+
+/* Please use this code with old D compiler.
+version (Win32) {
         extern(Windows):
-} else {
+}
+else {
         extern(C):
 }
+*/
 
 alias uint GLenum;
@@ -1116 +1123 @@
 
 void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
-void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf ref_);
+void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf cref);
 GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
 void /*APIENTRY*/glArrayElement (GLint i);
@@ -1369 +1376 @@
 void /*APIENTRY*/glSelectBuffer (GLsizei size, GLuint *buffer);
 void /*APIENTRY*/glShadeModel (GLenum mode);
-void /*APIENTRY*/glStencilFunc (GLenum func, GLint ref_, GLuint mask);
+void /*APIENTRY*/glStencilFunc (GLenum func, GLint cref, GLuint mask);
 void /*APIENTRY*/glStencilMask (GLuint mask);
 void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
@@ -1485 +1492 @@
     (GLenum target, GLenum pname, GLfloat *params);
 
+//import openglu;

lang/d/koke/trunk/openglu.d

@@ -1 +1 @@
 import opengl;
 
-version(Windows) {
+extern(System):
+
+/* Please use this code with old D compiler.
+version (Win32) {
         extern(Windows):
-} else {
+}
+else {
         extern(C):
 }
+*/
 
 GLubyte* gluErrorString (