early-access version 2325

externals/SDL/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)

externals/SDL/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,10 +38,16 @@
 
 #endif /* OS2DEBUG */
 
-
+#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
+#define OS2_SysToUTF8(S) SDL_iconv_string("UTF-8", "", (char *)(S), SDL_strlen(S)+1)
+#define OS2_UTF8ToSys(S) SDL_iconv_string("", "UTF-8", (char *)(S), SDL_strlen(S)+1)
+#define libiconv_clean() do {} while(0)
+#else
 /* 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)
+#endif
 
 /* SDL_OS2Quit() will be called from SDL_QuitSubSystem() */
 void SDL_OS2Quit(void);

externals/SDL/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

externals/SDL/src/core/os2/iconv2.lbc

@@ -0,0 +1,4 @@
+# OpenWatcom exports file for libiconv
+++'libiconv'.'ICONV2'..'_libiconv'
+++'libiconv_close'.'ICONV2'..'_libiconv_close'
+++'libiconv_open'.'ICONV2'..'_libiconv_open'