Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6379 → Rev 6380

/contrib/sdk/sources/SDL-1.2.2/src/Makefile
77,7 → 77,7
# fasm ../../sound/src/sndgetsize.asm ../../sound/src/sndgetsize.o
 
%.o : %.asm Makefile
nasm -f coff $< -o $@
nasm -f win32 $< -o $@
 
%.obj : %.asm Makefile
fasm $< $@
109,4 → 109,6
$(CC) $(INCLUDES) $(CFLAGS) $(DEFINES) -o $@ $<
 
clean:
-rm -f */*/*.o
rm -rf *.o
rm -rf */*.o
rm -f */*/*.o
/contrib/sdk/sources/SDL-1.2.2/src/hermes/x86_main.asm
11,19 → 11,12
 
BITS 32
 
SECTION .text ALIGN=16
GLOBAL _ConvertX86
GLOBAL _x86return
GLOBAL _Hermes_X86_CPU
 
 
SECTION .data
cpu_flags dd 0
SECTION .text
;; _ConvertX86:
;; [ESP+8] ConverterInfo*
;; --------------------------------------------------------------------------
124,3 → 117,8
.L1:
xor eax,eax
ret
 
section '.DATA' ALIGN=16
 
cpu_flags dd 0
/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c
52,19 → 52,14
void MenuetOS_SDL_RepaintWnd(void)
{
begin_draw();
sys_create_window(1,1,vm_suf->hidden->win_size_x+9,vm_suf->hidden->win_size_y+get_skinh()+4,
#ifdef KEEP_OBSOLETE_STYLE3
IsStyle4Available?0x34000000:0x33000000
#else
0x34000000
#endif
,0,(int)vm_suf->hidden->__title);
sys_create_window(1,1,vm_suf->hidden->win_size_x+9,vm_suf->hidden->win_size_y+get_skinh()+4, (int)vm_suf->hidden->__title, 0x000000,0x34000000);
 
if(vm_suf && vm_suf->hidden->__video_buffer)
put_image(0,0,
put_image(1,1,
vm_suf->hidden->win_size_x,vm_suf->hidden->win_size_y,
vm_suf->hidden->__video_buffer);
 
begin_draw();;
end_draw();
}
 
static int MenuetOS_AllocHWSurface(_THIS,SDL_Surface * surface)
89,7 → 84,7
{
if(numrects)
{
put_image(0,0,
put_image(1,1,
vm_suf->hidden->win_size_x,vm_suf->hidden->win_size_y,
this->hidden->__video_buffer);
}
214,7 → 209,7
 
static int MenuetOS_FlipHWSurface(_THIS,SDL_Surface * surface)
{
put_image(0,0,surface->w,surface->h, surface->pixels);
put_image(1,1,surface->w,surface->h, surface->pixels);
return 0;
}