minor os/2 reorganization for iconv

Makefile.os2

@@ -12,11 +12,9 @@ LNKFILE = $(LIBNAME).lnk
 
 INCPATH = -I"$(%WATCOM)/h/os2" -I"$(%WATCOM)/h"
 INCPATH+= -Iinclude
-INCPATH+= -I"src/core/os2" -I"src/core/os2/geniconv"
 
 LIBM = libm.lib
-LIBS = mmpm2.lib libuls.lib libconv.lib $(LIBM)
-
+LIBS = mmpm2.lib $(LIBM)
 CFLAGS = -bt=os2 -d0 -q -bm -5s -fp5 -fpi87 -sg -oteanbmier -ei
 # max warnings:
 CFLAGS+= -wx
@@ -24,6 +22,8 @@ CFLAGS+= -wx
 CFLAGS+= -wcd=303
 # building dll:
 CFLAGS+= -bd
+# iconv:
+LIBS+= libuls.lib libconv.lib
 # the include paths :
 CFLAGS+= $(INCPATH)
 # building SDL itself (for DECLSPEC):
@@ -68,7 +68,8 @@ SRCS+= SDL_dummysensor.c
 SRCS+= SDL_locale.c SDL_syslocale.c
 SRCS+= SDL_url.c SDL_sysurl.c
 
-SRCS+= SDL_os2.c geniconv.c os2cp.c os2iconv.c sys2utf8.c
+SRCS+= SDL_os2.c
+SRCS+= geniconv.c os2cp.c os2iconv.c sys2utf8.c
 SRCS+= SDL_os2audio.c
 SRCS+= SDL_os2video.c SDL_os2util.c SDL_os2dive.c SDL_os2vman.c &
        SDL_os2mouse.c SDL_os2messagebox.c
@@ -83,7 +84,8 @@ MOBJS= $(MSRCS:.c=.obj)
 
 .c: ./src;./src/dynapi;./src/audio;./src/cpuinfo;./src/events;./src/file;./src/haptic;./src/joystick;./src/power;./src/render;./src/render/software;./src/sensor;./src/stdlib;./src/thread;./src/timer;./src/video;./src/video/yuv2rgb;./src/atomic;./src/audio/disk;
 .c: ./src/haptic/dummy;./src/joystick/dummy;./src/joystick/virtual;./src/audio/dummy;./src/video/dummy;./src/sensor/dummy;
-.c: ./src/core/os2;./src/core/os2/geniconv;./src/audio/os2;./src/loadso/os2;./src/filesystem/os2;./src/joystick/os2;./src/thread/os2;./src/timer/os2;./src/video/os2;
+.c: ./src/core/os2;./src/audio/os2;./src/loadso/os2;./src/filesystem/os2;./src/joystick/os2;./src/thread/os2;./src/timer/os2;./src/video/os2;
+.c: ./src/core/os2/geniconv;
 .c: ./src/locale/;./src/locale/unix;./src/misc;./src/misc/dummy;./src/joystick/hidapi;./src/hidapi
 
 all: $(DLLFILE) $(LIBFILE) .symbolic

src/core/os2/SDL_os2.c

@@ -23,7 +23,7 @@
 
 #if defined(__OS2__)
 
-#include "geniconv/geniconv.h"
+#include "SDL_os2.h"
 
 /* SDL_OS2Quit() will be called from SDL_QuitSubSystem() */
 void SDL_OS2Quit(void)

src/core/os2/SDL_os2.h

@@ -23,7 +23,6 @@
 
 #include "SDL_log.h"
 #include "SDL_stdinc.h"
-#include "geniconv/geniconv.h"
 
 #ifdef OS2DEBUG
 #if (OS2DEBUG-0 >= 2)
@@ -39,8 +38,8 @@
 
 #endif /* OS2DEBUG */
 
-
 /* StrUTF8New() - geniconv/sys2utf8.c */
+#include "geniconv/geniconv.h"
 #define OS2_SysToUTF8(S) StrUTF8New(1,         (S), SDL_strlen((S)) + 1)
 #define OS2_UTF8ToSys(S) StrUTF8New(0, (char *)(S), SDL_strlen((S)) + 1)
 

src/core/os2/geniconv/geniconv.h

@@ -28,7 +28,7 @@
 #ifndef GENICONV_H
 #define GENICONV_H
 
-#include <iconv.h>
+#include "iconv.h"
 
 #ifdef iconv_open
 #undef iconv_open