From af6dd16464361ad1ad492c85d04b4a7467a2da68 Mon Sep 17 00:00:00 2001 From: maxcodehack Date: Mon, 16 Nov 2020 16:07:39 +0000 Subject: [PATCH] Fix makefile in SDL. Now it works full git-svn-id: svn://kolibrios.org@8201 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../sdk/sources/SDL-1.2.2/src/Makefile_test | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test b/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test index b5904fa9d2..4ed74743b6 100755 --- a/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test +++ b/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test @@ -1,6 +1,17 @@ # SDL build makefile_test # writed by maxcodehack +# first export MENUETDEV +# second +# for build: +# make -f Makefile_test install +# for clean: +# make -f Makefile_test clean + +# if you get many errors looks: +# " multiple definition of `inportb' " +# comment them in $(MENUETDEV)/include/inlines/pc.h + CC = kos32-gcc AR = kos32-ar LD = kos32-ld @@ -10,13 +21,9 @@ SDK_DIR:= $(abspath ../../..) endian_OBJS = endian/SDL_endian.o file_OBJS = file/SDL_rwops.o -# First save this: hermes_OBJS = hermes/mmxp2_32.o hermes/mmx_main.o hermes/x86p_16.o \ hermes/x86p_32.o hermes/x86_main.o - -# After only this -# hermes_OBJS = hermes/mmxp2_32.obj hermes/mmx_main.o hermes/x86p_16.obj \ - hermes/x86p_32.obj hermes/x86_main.obj + thread_OBJS = thread/SDL_syscond.o thread/SDL_sysmutex.o thread/SDL_syssem.o \ thread/SDL_systhread.o thread/SDL_thread.o timer_OBJS = timer/SDL_timer.o timer/dummy/SDL_systimer.o @@ -59,11 +66,11 @@ install: libSDL.a libSDL.a: $(OBJS) $(AR) $(ARFLAGS) libSDL.a $(OBJS) -%.obj : %.asm Makefile +%.o : %.asm Makefile nasm -f coff $< $ %.o : %.c Makefile $(CC) $(CFLAGS) -o $@ $< clean: - -rm -f */*.o + rm -f */*.o \ rm *.o \ rm */*/*.o