From ed8413c937fabd8e26570f3db3f30953573ba5a9 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sun, 18 Nov 2018 11:50:02 +0300 Subject: [PATCH] Makefile.os2: build libm as a static lib and add it to linkage. in case it is needed some day. --- Makefile.os2 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.os2 b/Makefile.os2 index 95c5cef591c06..e79f7953f7123 100644 --- a/Makefile.os2 +++ b/Makefile.os2 @@ -15,7 +15,8 @@ INCPATH = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h" INCPATH+= -I"$(LIBHOME)/h" INCPATH+= -Iinclude -LIBS = mmpm2.lib libuls.lib libconv.lib +LIBM = libm.lib +LIBS = mmpm2.lib libuls.lib libconv.lib $(LIBM) CFLAGS = -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei # max warnings: @@ -27,6 +28,10 @@ CFLAGS+= $(INCPATH) # building SDL itself: CFLAGS+= -DBUILD_SDL +MSRCS= e_atan2.c e_exp.c e_fmod.c e_log10.c e_log.c e_pow.c e_rem_pio2.c e_sqrt.c & + k_cos.c k_rem_pio2.c k_sin.c k_tan.c & + s_atan.c s_copysign.c s_cos.c s_fabs.c s_floor.c s_scalbn.c s_sin.c s_tan.c + SRCS = SDL.c SDL_assert.c SDL_error.c SDL_log.c SDL_dataqueue.c SDL_hints.c SRCS+= SDL_getenv.c SDL_iconv.c SDL_malloc.c SDL_qsort.c SDL_stdlib.c SDL_string.c SRCS+= SDL_cpuinfo.c SDL_atomic.c SDL_spinlock.c SDL_thread.c SDL_timer.c @@ -56,6 +61,7 @@ SRCS+= SDL_dummysensor.c SRCS+= SDL_dynapi.c OBJS = $(SRCS:.c=.obj) +MOBJS= $(MSRCS:.c=.obj) .extensions: .extensions: .lib .dll .obj .c .asm @@ -66,7 +72,7 @@ OBJS = $(SRCS:.c=.obj) all: $(DLLFILE) $(LIBFILE) .symbolic -$(DLLFILE): $(OBJS) $(LNKFILE) +$(DLLFILE): $(OBJS) $(LIBM) $(LNKFILE) @echo * Linking: $@ wlink @$(LNKFILE) @@ -95,6 +101,10 @@ SDL_blendpoint.obj: SDL_blendpoint.c SDL_RLEaccel.obj: SDL_RLEaccel.c wcc386 $(CFLAGS) -wcd=201 -fo=$^@ $< +.c: ./src/libm; +$(LIBM): $(MOBJS) + wlib -q -b -n -c -pa -s -t -zld -ii -io $@ $(MOBJS) + $(LNKFILE): @echo * Creating linker file: $@ @%create $@ @@ -118,6 +128,7 @@ clean: .SYMBOLIC @if exist *.obj rm *.obj @if exist *.err rm *.err @if exist $(LNKFILE) rm $(LNKFILE) + @if exist $(LIBM) rm $(LIBM) distclean: .SYMBOLIC clean @if exist $(LIBHOME)/*.exp rm $(LIBHOME)/*.exp