Attachment #131403 for bug #188456





	private import std.c.windows.windows;
	extern(Windows):
}
else {
	extern(C):


alias uint GLenum;
alias ubyte GLboolean;

/*************************************************************/

void /*APIENTRY*/glAccum (GLenum op, GLfloat value);
void /*APIENTRY*/glAlphaFunc (GLenum func, GLclampf);
GLboolean /*APIENTRY*/glAreTexturesResident (GLsizei n, GLuint *textures, GLboolean *residences);
void /*APIENTRY*/glArrayElement (GLint i);
void /*APIENTRY*/glBegin (GLenum mode);

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, GLuint mask);
void /*APIENTRY*/glStencilMask (GLuint mask);
void /*APIENTRY*/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
void /*APIENTRY*/glTexCoord1d (GLdouble s);

Lines 1-11 Link Here

(-)ES_d/import/openglu.d (-5 / +2 lines)
1	import opengl;	1	import opengl;
2		2
3	version (Win32) {	3
4	extern(Windows):
5	}
6	else {
7	extern(C):	4	extern(C):
8	}	5
9		6
10	GLubyte* gluErrorString (	7	GLubyte* gluErrorString (
11	GLenum errCode);	8	GLenum errCode);




DC=gdmd
DFLAGS=-g -O -d -release -Iimport -Isrc
DOUT=-of

DSRC=$(shell find src/ -name "*.d")
SOURCES=$(DSRC) import/SDL_video.d import/SDL_mouse.d import/SDL_mixer.d
OBJS=$(SOURCES:.d=.o)
EXE=es

all: $(EXE)

$(EXE): $(OBJS)
	gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer

$(OBJS): %.o: %.d
	$(DC) -c $(DOUT)$@ $(DFLAGS) $<


Lines 4-10 Link Here

(-)ES_d/src/es/boot.d (-1 / +19 lines)
4		4
5	private import es.mouse;	5	private import es.mouse;
6		6
7	private Mainloop mainloop;	7	private Mainloop mainloop;
		8	private Mouse mouse;
		9
		10	version (Win32_release) {
		11
8		12
9	private:	13	private:
10	import std.c.windows.windows;	14	import std.c.windows.windows;
Lines 39-44 Link Here
39	gc_term();	43	gc_term();
40	return result;	44	return result;
41	}	45	}
		46	} else {
		47	// Boot as the general executable.
		48	public int main(char[][] args) {
		49	return boot(args);
		50	}
		51	}
		52
		53	public int boot(char[][] args) {
		54	double d;
		55	mouse = new Mouse();
		56	mainloop = new Mainloop(mouse);
		57	mainloop.loop();
		58	return 0;
		59	}
42		60
43	int user_start(){	61	int user_start(){
44	double d;	62	double d;

Lines 73-76 Link Here

(-)ES_d/src/es/sound.d (-1 / +1 lines)
73	public int Sound_PlayingMusic(){	73	public int Sound_PlayingMusic(){
74	if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;	74	if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;
75	return _Sound_PlayingMusic;	75	return _Sound_PlayingMusic;
76	}	76	}

Return to bug 188456

Lines 1-10 Link Here

(-)ES_d/import/opengl.d (-8 / +4 lines)
1	version (Win32) {	1
2	private import std.c.windows.windows;
3	extern(Windows):
4	}
5	else {
6	extern(C):	2	extern(C):
7	}	3
8		4
9	alias uint GLenum;	5	alias uint GLenum;
10	alias ubyte GLboolean;	6	alias ubyte GLboolean;
Lines 1116-1122 Link Here
1116	/*************************************************************/	1112	/*************************************************************/
1117		1113
1118	void /APIENTRY/glAccum (GLenum op, GLfloat value);	1114	void /APIENTRY/glAccum (GLenum op, GLfloat value);
1119	void /APIENTRY/glAlphaFunc (GLenum func, GLclampf ref);	1115	void /APIENTRY/glAlphaFunc (GLenum func, GLclampf);
1120	GLboolean /APIENTRY/glAreTexturesResident (GLsizei n, GLuint textures, GLboolean residences);	1116	GLboolean /APIENTRY/glAreTexturesResident (GLsizei n, GLuint textures, GLboolean residences);
1121	void /APIENTRY/glArrayElement (GLint i);	1117	void /APIENTRY/glArrayElement (GLint i);
1122	void /APIENTRY/glBegin (GLenum mode);	1118	void /APIENTRY/glBegin (GLenum mode);
Lines 1369-1375 Link Here
1369	void /APIENTRY/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);	1365	void /APIENTRY/glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
1370	void /APIENTRY/glSelectBuffer (GLsizei size, GLuint *buffer);	1366	void /APIENTRY/glSelectBuffer (GLsizei size, GLuint *buffer);
1371	void /APIENTRY/glShadeModel (GLenum mode);	1367	void /APIENTRY/glShadeModel (GLenum mode);
1372	void /APIENTRY/glStencilFunc (GLenum func, GLint ref, GLuint mask);	1368	void /APIENTRY/glStencilFunc (GLenum func, GLint, GLuint mask);
1373	void /APIENTRY/glStencilMask (GLuint mask);	1369	void /APIENTRY/glStencilMask (GLuint mask);
1374	void /APIENTRY/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);	1370	void /APIENTRY/glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
1375	void /APIENTRY/glTexCoord1d (GLdouble s);	1371	void /APIENTRY/glTexCoord1d (GLdouble s);

Line 0 Link Here

(-)ES_d/Makefile (+17 lines)
	1	DC=gdmd
	2	DFLAGS=-g -O -d -release -Iimport -Isrc
	3	DOUT=-of
	4
	5	DSRC=$(shell find src/ -name "*.d")
	6	SOURCES=$(DSRC) import/SDL_video.d import/SDL_mouse.d import/SDL_mixer.d
	7	OBJS=$(SOURCES:.d=.o)
	8	EXE=es
	9
	10	all: $(EXE)
	11
	12	$(EXE): $(OBJS)
	13	gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
	14
	15	$(OBJS): %.o: %.d
	16	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
	17