diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-02-27 02:22:08 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-02-27 02:22:08 +0000 |
| commit | 692e39d1bbe14f0c84e1d0e98e578534d1f1d656 (patch) | |
| tree | 1dfec903910553e323f6b04b510c315fc8a3caed /Source/Core/DiscIO/Src/BannerLoader.cpp | |
| parent | a680d17eef88646b8cd6018c1c5e8f0e39d056ee (diff) | |
| parent | be7643cd2d1a27324070550ad82eca2c3bd59f19 (diff) | |
Merge branch 'arm-noglsl'
Diffstat (limited to 'Source/Core/DiscIO/Src/BannerLoader.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/BannerLoader.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp index 6451c73670..2350896c9c 100644 --- a/Source/Core/DiscIO/Src/BannerLoader.cpp +++ b/Source/Core/DiscIO/Src/BannerLoader.cpp @@ -27,7 +27,9 @@ #include <Windows.h> #else #include <sys/param.h> +#ifndef ANDROID #include <iconv.h> +#endif #include <errno.h> #endif @@ -132,6 +134,9 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 } } #else +#ifdef ANDROID + return false; +#else if (_src) { iconv_t conv_desc = iconv_open("UTF-8", "CP932"); @@ -194,6 +199,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16 iconv_close(conv_desc); } #endif +#endif return returnCode; } |