From 543bb3ae4cd45d910b507ce70620f1dfac469173 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Thu, 8 Jul 2010 17:59:56 +0000
Subject: [PATCH] Glenn's iconv code seems to work fine on OS X.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5858 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 SConstruct                              | 1 +
 Source/Core/DiscIO/Src/BannerLoader.cpp | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index c91274fdaf..6fc14154f9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -270,6 +270,7 @@ if sys.platform == 'darwin':
     env['CXX'] = "g++-4.2"
     env['CXXFLAGS'] = ['-x', 'objective-c++']
     env['CCFLAGS'] += ['-arch' , 'x86_64' , '-arch' , 'i386']
+    env['LIBS'] += ['iconv']
     env['LINKFLAGS'] += ['-arch', 'x86_64' , '-arch' , 'i386']
     env['FRAMEWORKS'] += ['CoreFoundation', 'CoreServices']
     env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
index 346b28e9f7..40c4d7e278 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoader.cpp
@@ -26,9 +26,7 @@
 // HyperIris: dunno if this suitable, may be need move.
 #ifdef WIN32
 #include <Windows.h>
-#endif
-
-#ifdef __linux__
+#else
 #include <iconv.h>
 #include <errno.h>
 #endif
@@ -125,7 +123,7 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16
 			delete[] buffer;
 		}
 	}
-#elif defined(__linux__)
+#else
 	if (_src)
 	{
 		iconv_t conv_desc = iconv_open("UTF-8", "CP932");
@@ -185,8 +183,6 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16
 		delete[] src_buffer_start;
 		iconv_close(conv_desc);
 	}
-#elif defined(__APPLE__)
-	// TODO:  Implement this (Maybe the linux code will work?)
 #endif
 	return returnCode;
 }