From 74a3bc7a32ff6941c507e0db30b7e1efb5ea0ecd Mon Sep 17 00:00:00 2001 From: maxcodehack Date: Sun, 15 Nov 2020 11:54:06 +0000 Subject: [PATCH] Fix 'ar' in SDL git-svn-id: svn://kolibrios.org@8198 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../sdk/sources/SDL-1.2.2/src/Makefile_test | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 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 cd4b18c018..b5904fa9d2 100755 --- a/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test +++ b/contrib/sdk/sources/SDL-1.2.2/src/Makefile_test @@ -1,3 +1,6 @@ +# SDL build makefile_test +# writed by maxcodehack + CC = kos32-gcc AR = kos32-ar LD = kos32-ld @@ -6,7 +9,13 @@ SDK_DIR:= $(abspath ../../..) endian_OBJS = endian/SDL_endian.o file_OBJS = file/SDL_rwops.o -hermes_OBJS = hermes/mmxp2_32.obj hermes/mmx_main.obj hermes/x86p_16.obj \ + +# 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 @@ -22,10 +31,7 @@ video_OBJS = video/SDL_blit_0.o video/SDL_blit_1.o video/SDL_blit_A.o \ video/SDL_yuv_sw.o video/menuetos/SDL_menuetevents.o \ video/menuetos/SDL_menuetvideo.o audio_OBJS = audio/SDL_kolibri_audio.o -#\ -# audio/klbr_sdk/src/init.o audio/klbr_sdk/src/setbuf.o \ -# audio/klbr_sdk/src/stopbuf.o audio/klbr_sdk/src/sndgetsize.o - + curr_OBJS = SDL.o SDL_error.o SDL_fatal.o SDL_getenv.o OBJS = $(endian_OBJS) $(file_OBJS) $(hermes_OBJS) $(thread_OBJS) \ @@ -44,16 +50,14 @@ CFLAGS = -c -O2 -D_REENTRANT -I../include -I $(MENUETDEV)/include -I. -DPACKAGE= 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 - -#include $(MENUETDEV)/makefiles/Makefile_for_lib - + all: libSDL.a install: libSDL.a mv -f libSDL.a $(SDK_DIR)/lib libSDL.a: $(OBJS) - $(AR) $(ARFLAGS) libSDL.a + $(AR) $(ARFLAGS) libSDL.a $(OBJS) %.obj : %.asm Makefile nasm -f coff $< $