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
This commit is contained in:
parent
75871dab65
commit
543bb3ae4c
|
@ -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']
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue