Skip to content

Commit e55b850

Browse files
committed
minor tidy-up in os2 makefile for tests.
1 parent fc4296c commit e55b850

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

test/Makefile.os2

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
# Open Watcom makefile to build SDL2 tests for OS/2
2+
# wmake -f Makefile.os2
3+
14
BINPATH = .
25

6+
INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include
7+
8+
CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei
9+
CFLAGS+= -wx -wcd=303
10+
11+
LIBPATH = ..
12+
LIBS = SDL2.lib $(TESTLIB)
13+
14+
#CFLAGS+= -DHAVE_SDL_TTF
15+
#TTFLIBS = SDL2ttf.lib
16+
317
TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe &
418
testdrawchessboard.exe testdropfile.exe testerror.exe testfile.exe &
519
testfilesystem.exe testgamecontroller.exe testgeometry.exe testgesture.exe &
@@ -17,7 +31,6 @@ TARGETS = testatomic.exe testdisplayinfo.exe testbounds.exe testdraw2.exe &
1731
testyuv.exe testgl2.exe testvulkan.exe testnative.exe testautomation.exe
1832

1933
# SDL2test.lib sources (../src/test)
20-
2134
CSRCS = SDL_test_assert.c SDL_test_common.c SDL_test_compare.c &
2235
SDL_test_crc32.c SDL_test_font.c SDL_test_fuzzer.c SDL_test_harness.c &
2336
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 &
2639
TESTLIB = SDL2test.lib
2740

2841
# testautomation sources
29-
3042
TASRCS = testautomation.c testautomation_audio.c testautomation_clipboard.c &
3143
testautomation_events.c testautomation_hints.c &
3244
testautomation_keyboard.c testautomation_main.c &
@@ -43,17 +55,6 @@ TAOBJS = $(TASRCS:.c=.obj)
4355

4456
all: $(TARGETS)
4557

46-
INCPATH = -I$(%WATCOM)/h/os2 -I$(%WATCOM)/h -I../include
47-
48-
CFLAGS = $(INCPATH) -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei
49-
CFLAGS+= -wx -wcd=303
50-
51-
LIBPATH = ..
52-
LIBS = SDL2.lib $(TESTLIB)
53-
54-
#CFLAGS+= -DHAVE_SDL_TTF
55-
#LIBS_TTF = SDL2ttf.lib
56-
5758
.c: ../src/test
5859

5960
$(TESTLIB): $(COBJS)
@@ -85,7 +86,7 @@ testyuv.exe: testyuv.obj testyuv_cvt.obj
8586

8687
testime.exe: testime.obj
8788
@%make $(TESTLIB)
88-
wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(LIBS_TTF)} op q op el file {$<} name $@
89+
wlink SYS os2v2 libpath $(LIBPATH) lib {$(LIBS) $(TTFLIBS)} op q op el file {$<} name $@
8990

9091
clean: .SYMBOLIC
9192
@echo * Clean tests in $(BINPATH)

0 commit comments

Comments
 (0)