Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2024-12-26 16:37:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

SDL and SDL_newlib:

Browse Source 
- Fixed mouse button handling events. 
- Fixed Makefile
- Delete compile.sh file
 

git-svn-id: svn://kolibrios.org@8648 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-03-25 19:14:30 +00:00
parent 4ab1cbe4b1
commit df681ee6ff
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/sdk/sources/SDL-1.2.2/src/video/menuetos/SDL_menuetevents.c
View File

@ -225,16 +225,16 @@ void MenuetOS_PumpEvents(_THIS)
if ((__tmp^oldmousestate)&1) { if ((__tmp^oldmousestate)&1) {
if(__tmp&1) if(__tmp&1)
{ {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LMASK,0,0); SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LEFT,0,0);
} else { } 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^oldmousestate)&2) {
if(__tmp&2) if(__tmp&2)
{ {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RMASK,0,0); SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RIGHT,0,0);
} else { } else {
SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RMASK,0,0); SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RIGHT,0,0);
} } } }
oldmousestate = __tmp; oldmousestate = __tmp;
} }

23
contrib/sdk/sources/SDL-1.2.2_newlib/src/Makefile
View File

@ -1,7 +1,8 @@
CC = kos32-gcc CC = kos32-gcc
AR = kos32-ar AR = kos32-ar
LD = kos32-ld
LIBNAME=libSDLn.a
SDK_DIR:= $(abspath ../../..) SDK_DIR:= $(abspath ../../..)
endian_OBJS = endian/SDL_endian.o 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 \ -DNO_SIGNAL_H -DDISABLE_STDIO -DNEED_SDL_GETENV -DENABLE_FILE -UDISABLE_FILE \
-D__KOLIBRIOS__ -DDEBUG_VIDEO -UWIN32 -U_Win32 -U_WIN32 -U__MINGW32__ \ -D__KOLIBRIOS__ -DDEBUG_VIDEO -UWIN32 -U_Win32 -U_WIN32 -U__MINGW32__ \
-I../../newlib/libc/include/ -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 install: $(LIBNAME)
mv -f libSDL.a $(SDK_DIR)/lib mv -f $(LIBNAME) $(SDK_DIR)/lib
libSDL.a: $(OBJS) $(LIBNAME): $(OBJS)
$(AR) $(ARFLAGS) libSDL.a $(OBJS) SYSCALL/src/os.o $(MAKE) -C SYSCALL/src
$(AR) -crs $(LIBNAME) $(OBJS) SYSCALL/src/os.o
%.o : %.asm Makefile %.o : %.asm Makefile
nasm -f coff $< $ nasm -f coff $<
%.o : %.c Makefile %.o : %.c Makefile
$(CC) $(CFLAGS) -o $@ $< $(CC) $(CFLAGS) -o $@ $<

5
contrib/sdk/sources/SDL-1.2.2_newlib/src/compile.sh
View File

@ -1,5 +0,0 @@
cd SYSCALL/src
make
cd ../..
make install
make clean

8
contrib/sdk/sources/SDL-1.2.2_newlib/src/video/menuetos/SDL_menuetevents.c
View File

@ -226,16 +226,16 @@ void MenuetOS_PumpEvents(_THIS)
if ((__tmp^oldmousestate)&1) { if ((__tmp^oldmousestate)&1) {
if(__tmp&1) if(__tmp&1)
{ {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LMASK,0,0); SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_LEFT,0,0);
} else { } 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^oldmousestate)&2) {
if(__tmp&2) if(__tmp&2)
{ {
SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RMASK,0,0); SDL_PrivateMouseButton(SDL_PRESSED,SDL_BUTTON_RIGHT,0,0);
} else { } else {
SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RMASK,0,0); SDL_PrivateMouseButton(SDL_RELEASED,SDL_BUTTON_RIGHT,0,0);
} } } }
oldmousestate = __tmp; oldmousestate = __tmp;
} }