diff --git a/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c b/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c index a4e94e89d2..593182f743 100644 --- a/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c +++ b/contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c @@ -225,16 +225,16 @@ void MenuetOS_PumpEvents(_THIS) if ((__tmp^oldmousestate)&1) { if(__tmp&1) { - SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LMASK,0,0); + SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LEFT,0,0); } else { - SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_LMASK,0,0); + SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_LEFT,0,0); } } if ((__tmp^oldmousestate)&2) { if(__tmp&2) { - SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RMASK,0,0); + SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RIGHT,0,0); } else { - SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RMASK,0,0); + SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RIGHT,0,0); } } oldmousestate = __tmp; } diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/Makefile b/contrib/sdk/sources/SDL-1.2.2_newlib/src/Makefile index bd182f32ec..f351d5f2e6 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/Makefile +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/Makefile @@ -1,7 +1,8 @@ CC = kos32-gcc AR = kos32-ar -LD = kos32-ld - + +LIBNAME=libSDLn.a + SDK_DIR:= $(abspath ../../..) endian_OBJS = endian/SDL_endian.o @@ -38,22 +39,18 @@ CFLAGS = -c -O2 -D_REENTRANT -I../include -I SYSCALL/include -I. -DPACKAGE=\"SDL -DNO_SIGNAL_H -DDISABLE_STDIO -DNEED_SDL_GETENV -DENABLE_FILE -UDISABLE_FILE \ -D__KOLIBRIOS__ -DDEBUG_VIDEO -UWIN32 -U_Win32 -U_WIN32 -U__MINGW32__ \ -I../../newlib/libc/include/ - - -LDFLAGS = -shared -s -T../../newlib/libc/app.lds -nostdlib --image-base 0 -L /home/autobuild/tools/win32/mingw32/lib -lgcc -lz -ldll -lc.dll - -ARFLAGS = crs -all: libSDL.a +all: $(LIBNAME) -install: libSDL.a - mv -f libSDL.a $(SDK_DIR)/lib +install: $(LIBNAME) + mv -f $(LIBNAME) $(SDK_DIR)/lib -libSDL.a: $(OBJS) - $(AR) $(ARFLAGS) libSDL.a $(OBJS) SYSCALL/src/os.o +$(LIBNAME): $(OBJS) + $(MAKE) -C SYSCALL/src + $(AR) -crs $(LIBNAME) $(OBJS) SYSCALL/src/os.o %.o : %.asm Makefile - nasm -f coff $< $ + nasm -f coff $< %.o : %.c Makefile $(CC) $(CFLAGS) -o $@ $< diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/compile.sh b/contrib/sdk/sources/SDL-1.2.2_newlib/src/compile.sh deleted file mode 100755 index 1f2aaf6f7b..0000000000 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/compile.sh +++ /dev/null @@ -1,5 +0,0 @@ -cd SYSCALL/src -make -cd ../.. -make install -make clean diff --git a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c index 248a245054..c3ea47deb2 100755 --- a/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c +++ b/contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c @@ -226,16 +226,16 @@ void MenuetOS_PumpEvents(_THIS) if ((__tmp^oldmousestate)&1) { if(__tmp&1) { - SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LMASK,0,0); + SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LEFT,0,0); } else { - SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_LMASK,0,0); + SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_LEFT,0,0); } } if ((__tmp^oldmousestate)&2) { if(__tmp&2) { - SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RMASK,0,0); + SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RIGHT,0,0); } else { - SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RMASK,0,0); + SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RIGHT,0,0); } } oldmousestate = __tmp; }