Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5592 → Rev 5600

/contrib/sdk/sources/eglut/Makefile
8,7 → 8,7
 
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer
 
INCLUDES= -I. -I../newlib/libc/include -I../Mesa/include -I../Mesa/src/gbm/main -I../libdrm/include
INCLUDES= -I. -I../newlib/libc/include -I../Mesa/mesa-9.2.5/include -I../Mesa/mesa-9.2.5/src/gbm/main -I../libdrm/include
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/libc/dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --out-implib $(IMPLIB)
/contrib/sdk/sources/eglut/swap.c
80,6 → 80,9
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, render->tx_buffers[render->back_buffer]);
 
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, render->tx_mask);
 
xscale = 1.0/render->scr_width;
yscale = 1.0/render->scr_height;
 
100,6 → 103,7
vertices[3*2+1] = t5;
 
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
glFinish();
 
err1:
eglMakeCurrent(render->dpy, draw, read, context);