From e55b850703bcb789a92e28ea656eb2122d2ddc5b Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Mon, 20 Sep 2021 23:50:02 +0300
Subject: [PATCH] minor tidy-up in os2 makefile for tests.
---
test/Makefile.os2 | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/test/Makefile.os2 b/test/Makefile.os2
index 2d2acdbf61..b4dff1f2b5 100644
--- a/test/Makefile.os2
+++ b/test/Makefile.os2
@@ -1,5 +1,19 @@
+# Open Watcom makefile to build SDL2 tests for OS/2
+# wmake -f Makefile.os2
+
BINPATH = .
+INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include
+
+CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei
+CFLAGS+= -wx -wcd=303
+
+LIBPATH = ..
+LIBS = SDL2.lib $(TESTLIB)
+
+#CFLAGS+= -DHAVE_SDL_TTF
+#TTFLIBS = SDL2ttf.lib
+
TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe &
testdrawchessboard.exe testdropfile.exe testerror.exe testfile.exe &
testfilesystem.exe testgamecontroller.exe testgeometry.exe testgesture.exe &
@@ -17,7 +31,6 @@ TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe &
testyuv.exe testgl2.exe testvulkan.exe testnative.exe testautomation.exe
# SDL2test.lib sources (../src/test)
-
CSRCS = SDL_test_assert.c SDL_test_common.c SDL_test_compare.c &
SDL_test_crc32.c SDL_test_font.c SDL_test_fuzzer.c SDL_test_harness.c &
SDL_test_imageBlit.c SDL_test_imageBlitBlend.c SDL_test_imageFace.c &
@@ -26,7 +39,6 @@ CSRCS = SDL_test_assert.c SDL_test_common.c SDL_test_compare.c &
TESTLIB = SDL2test.lib
# testautomation sources
-
TASRCS = testautomation.c testautomation_audio.c testautomation_clipboard.c &
testautomation_events.c testautomation_hints.c &
testautomation_keyboard.c testautomation_main.c &
@@ -43,17 +55,6 @@ TAOBJS = $(TASRCS:.c=.obj)
all: $(TARGETS)
-INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include
-
-CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei
-CFLAGS+= -wx -wcd=303
-
-LIBPATH = ..
-LIBS = SDL2.lib $(TESTLIB)
-
-#CFLAGS+= -DHAVE_SDL_TTF
-#LIBS_TTF = SDL2ttf.lib
-
.c: ../src/test
$(TESTLIB): $(COBJS)
@@ -85,7 +86,7 @@ testyuv.exe: testyuv.obj testyuv_cvt.obj
testime.exe: testime.obj
@%make $(TESTLIB)
- wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(LIBS_TTF)} op q op el file {$<} name $@
+ wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(TTFLIBS)} op q op el file {$<} name $@
clean: .SYMBOLIC
@echo * Clean tests in $(BINPATH)