From 19cafa3575384281f3770688bfa0533108d9105d Mon Sep 17 00:00:00 2001
From: Cameron Cawley <[EMAIL REDACTED]>
Date: Sat, 24 Sep 2022 15:08:39 +0100
Subject: [PATCH] Include SDL_iconv.obj in OS/2 builds
---
Makefile.os2 | 3 +--
test/Makefile.os2 | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.os2 b/Makefile.os2
index 3f3fb1d7..5526a7ac 100644
--- a/Makefile.os2
+++ b/Makefile.os2
@@ -71,8 +71,7 @@ videoobjs = SDL_blit.obj SDL_blit_0.obj SDL_blit_1.obj SDL_blit_A.obj &
SDL_os2fslib.obj &
SDL_nullevents.obj SDL_nullmouse.obj SDL_nullvideo.obj
-stdlibobjs = SDL_malloc.obj SDL_qsort.obj SDL_string.obj
-# SDL_iconv.obj
+stdlibobjs = SDL_iconv.obj SDL_malloc.obj SDL_qsort.obj SDL_string.obj
!ifeq HERMES 1
hermesobjs= mmx_main.obj mmxp2_32.obj x86_main.obj x86p_16.obj x86p_32.obj
diff --git a/test/Makefile.os2 b/test/Makefile.os2
index 99b1e78d..915a86f7 100644
--- a/test/Makefile.os2
+++ b/test/Makefile.os2
@@ -1,11 +1,10 @@
TARGETS = checkkeys.exe graywin.exe loopwave.exe testalpha.exe testbitmap.exe &
testblitspeed.exe testcdrom.exe testcursor.exe testdyngl.exe &
testerror.exe testfile.exe testgamma.exe testgl.exe testhread.exe &
- testjoystick.exe testkeys.exe testlock.exe &
+ testiconv.exe testjoystick.exe testkeys.exe testlock.exe &
testoverlay2.exe testoverlay.exe testpalette.exe testplatform.exe &
testsem.exe testsprite.exe testtimer.exe testver.exe testvidinfo.exe &
testwin.exe testwm.exe threadwin.exe torturethread.exe testloadso.exe
-# testiconv.exe
OBJS = $(TARGETS:.exe=.obj)