Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6667 → Rev 6668

/contrib/sdk/sources/pixlib-3/Makefile
5,9 → 5,11
LD = kos32-ld
STRIP = kos32-strip
 
INSTALLDIR:= /home/autobuild/tools/win32/lib
 
ARFLAGS = crs
CFLAGS = -U_Win32 -U_WIN32 -U__MINGW32__ -c -O2 -fno-ident -fomit-frame-pointer
LDFLAGS:= -shared -s -nostdlib -Map px.map -T ../newlib/dll.lds --entry _DllStartup --image-base=0
LDFLAGS:= -shared -s -Map px.map -T dll.lds --entry _DllStartup --image-base=0
LDFLAGS+= --file-alignment 256
 
INCLUDES= -I. -I../newlib/libc/include
15,9 → 17,7
PXGL_INCLUDES= $(INCLUDES) -I../libdrm/intel -I../libdrm/include
PXGL_INCLUDES+= -I ../Mesa/mesa-9.2.5/include -I../Mesa/mesa-9.2.5/src/gbm/main
LIBPATH:= -L../../lib -L/home/autobuild/tools/win32/mingw32/lib
 
LIBS:= -ldll -legl.dll -lGL.dll -lc.dll -lgcc
LIBS:= -ldll -legl.dll -lGL.dll -lgcc -lc.dll
#LIBS+= -ldrm.dll
 
DEFINES:= -DNDEBUG
35,10 → 35,10
 
lib$(LIBRARY).a: $(OBJ_PIXLIB) Makefile
$(AR) $(ARFLAGS) lib$(LIBRARY).a $(OBJ_PIXLIB)
mv -f lib$(LIBRARY).a ../../lib
mv -f lib$(LIBRARY).a $(INSTALLDIR)
 
pixlib-gl.dll: $(OBJ_PXGL) Makefile
$(LD) $(LDFLAGS) $(PXFLAGS) $(LIBPATH) -o $@ $(OBJ_PXGL) $(LIBS)
$(LD) $(LDFLAGS) $(PXFLAGS) -o $@ $(OBJ_PXGL) $(LIBS)
mv -f $@ ../../bin
 
pixlib3.o : pixlib3.c Makefile
/contrib/sdk/sources/pixlib-3/pxgl.c
807,7 → 807,7
 
state = *(uint8_t*)(proc_info+70);
if(state & (WIN_STATE_MINIMIZED|WIN_STATE_ROLLED))
return;
return 0;
 
winx = *(uint32_t*)(proc_info+34);
winy = *(uint32_t*)(proc_info+38);
818,7 → 818,7
if( 0 != drm_ioctl(px->fd, SRV_FBINFO, &fb))
{
DBG("failed to get framebuffer info\n");
return;
return 0;
};
 
if( fb.width != px->scr_width ||
830,7 → 830,7
eglDestroyImageKHR(px->dpy, px->screen);
 
if(update_fb(px, fb.name, fb.pitch))
return;
return 0;
};
 
update.handle = px->mask.handle;
843,7 → 843,7
 
if(drm_ioctl(px->fd, SRV_MASK_UPDATE_EX, &update))
{
return;
return 0;
}
 
xscale = 1.0/px->scr_width;
886,7 → 886,7
 
glFlush();
 
return;
return 0;
};
 
static int hw_blit_planar(planar_t *planar, int dst_x, int dst_y,
905,7 → 905,7
 
state = *(uint8_t*)(proc_info+70);
if(state & (WIN_STATE_MINIMIZED|WIN_STATE_ROLLED))
return;
return 0;
 
winx = *(uint32_t*)(proc_info+34);
winy = *(uint32_t*)(proc_info+38);
916,7 → 916,7
if( 0 != drm_ioctl(px->fd, SRV_FBINFO, &fb))
{
DBG("failed to get framebuffer info\n");
return;
return 0;
};
 
if( fb.width != px->scr_width ||
928,7 → 928,7
eglDestroyImageKHR(px->dpy, px->screen);
 
if(update_fb(px, fb.name, fb.pitch))
return;
return 0;
};
 
update.handle = px->mask.handle;
941,7 → 941,7
 
if(drm_ioctl(px->fd, SRV_MASK_UPDATE_EX, &update))
{
return;
return 0;
}
 
xscale = 1.0/px->scr_width;
988,7 → 988,7
 
glFlush();
 
return;
return 0;
};
 
static int hw_create_client(int x, int y, uint32_t width, uint32_t height)