Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5022 → Rev 5024

/contrib/sdk/sources/Intel-2D/Makefile
8,7 → 8,7
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer
 
LDFLAGS:= -shared -s -nostdlib -T ../newlib/dll.lds --entry _DllStartup --image-base=0
PXFLAGS:= --version-script pixlib.ver --out-implib $(LIBRARY).dll.a
PXFLAGS:= --version-script pixlib.ver --out-implib lib$(LIBRARY).dll.a
SNAFLAGS:= --version-script sna.ver --output-def sna.def
UXAFLAGS:= --version-script uxa.ver --output-def uxa.def
78,7 → 78,7
$(LIBRARY).dll: $(OBJ_PIXLIB) Makefile
$(LD) $(LDFLAGS) $(PXFLAGS) $(LIBPATH) -o $@ $(OBJ_PIXLIB) $(LIBS)
mv -f $@ ../../bin
mv -f $(LIBRARY).dll.a ../../lib
mv -f lib$(LIBRARY).dll.a ../../lib
 
intel-sna.drv: $(OBJ_SNA) Makefile
$(LD) $(LDFLAGS) $(SNAFLAGS) $(LIBPATH) -o $@ $(OBJ_SNA) $(LIBS)
/contrib/sdk/sources/newlib/libc/include/kos32sys.h
146,7 → 146,6
 
__asm__ __volatile__(
"int $0x40 \n\t"
"rol $16, %%eax"
:"=a"(val)
:"a"(37),"b"(7));
return val;
/contrib/sdk/sources/render/render.c
453,7 → 453,7
(void *) (uintptr_t)mask_name, attribs);
printf("create mask image %p\n", mask_image);
if(mask_image == NULL)
goto err2
goto err2;
 
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST);
486,7 → 486,7
eglDestroyImageKHR(render->dpy, mask_image);
err2:
close.handle = mask_handle;
(void)drm_ioctl(fd, DRM_IOCTL_GEM_CLOSE, &close);
(void)drm_ioctl(render->fd, DRM_IOCTL_GEM_CLOSE, &close);
glBindTexture(GL_TEXTURE_2D, 0);
err1:
glDeleteTextures(1, &render->tx_mask);