diff --git a/contrib/sdk/sources/SDL-1.2.2/src/Makefile b/contrib/sdk/sources/SDL-1.2.2/src/Makefile index 51266cc1bf..7991affe28 100644 --- a/contrib/sdk/sources/SDL-1.2.2/src/Makefile +++ b/contrib/sdk/sources/SDL-1.2.2/src/Makefile @@ -77,7 +77,7 @@ LIBS:= -ldll -lc.dll -lgcc # 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 @@ $(LIBRARY).dll: $(OBJECTS) Makefile $(CC) $(INCLUDES) $(CFLAGS) $(DEFINES) -o $@ $< clean: - -rm -f */*/*.o + rm -rf *.o + rm -rf */*.o + rm -f */*/*.o diff --git a/contrib/sdk/sources/SDL-1.2.2/src/hermes/x86_main.asm b/contrib/sdk/sources/SDL-1.2.2/src/hermes/x86_main.asm index 917a61572b..12aded56b4 100644 --- a/contrib/sdk/sources/SDL-1.2.2/src/hermes/x86_main.asm +++ b/contrib/sdk/sources/SDL-1.2.2/src/hermes/x86_main.asm @@ -10,19 +10,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* @@ -61,7 +54,7 @@ y_loop: jmp [ebp+32] -_x86return: +_x86return: add esi,[ebp+12] add edi,[ebp+28] @@ -124,3 +117,8 @@ _Hermes_X86_CPU: .L1: xor eax,eax ret + +section '.DATA' ALIGN=16 + +cpu_flags dd 0 + diff --git a/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c b/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c index 9e982d4f65..3b11a061cc 100644 --- a/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c +++ b/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetvideo.c @@ -52,19 +52,14 @@ static int IsStyle4Available=0; 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 @@ static void MenuetOS_DirectUpdate(_THIS,int numrects,SDL_Rect * rects) { 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_VideoInit(_THIS,SDL_PixelFormat * vformat) 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; }