minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fix *BSD build with GNU iconv

mutilcraft-mt53
kwolekr 2015-06-29 02:39:22 -04:00 committed by est31
parent 0d65ee878c
commit 4e28c8d3c8
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -249,11 +249,18 @@ else()
else() else()
set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS}) set(PLATFORM_LIBS -lrt ${PLATFORM_LIBS})
endif(APPLE) endif(APPLE)
#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
# This way Xxf86vm is found on OpenBSD too # This way Xxf86vm is found on OpenBSD too
find_library(XXF86VM_LIBRARY Xxf86vm) find_library(XXF86VM_LIBRARY Xxf86vm)
mark_as_advanced(XXF86VM_LIBRARY) mark_as_advanced(XXF86VM_LIBRARY)
set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY}) set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
# Prefer local iconv if installed
find_library(ICONV_LIBRARY iconv)
mark_as_advanced(ICONV_LIBRARY)
if (ICONV_LIBRARY)
set(PLATFORM_LIBS ${PLATFORM_LIBS} ${ICONV_LIBRARY})
endif()
endif() endif()
check_include_files(endian.h HAVE_ENDIAN_H) check_include_files(endian.h HAVE_ENDIAN_H)

41
src/util/string.cpp
View File

@ -30,22 +30,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <map> #include <map>
#ifndef _WIN32 #ifndef _WIN32
#include <iconv.h> #include <iconv.h>
#else #else
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#include <windows.h> #include <windows.h>
#endif
#if defined(_ICONV_H_) && (defined(__FreeBSD__) || defined(__NetBSD__) || \
defined(__OpenBSD__) || defined(__DragonFly__))
#define BSD_ICONV_USED
#endif #endif
static bool parseHexColorString(const std::string &value, video::SColor &color); static bool parseHexColorString(const std::string &value, video::SColor &color);
static bool parseNamedColorString(const std::string &value, video::SColor &color); static bool parseNamedColorString(const std::string &value, video::SColor &color);
#ifndef _WIN32 #ifndef _WIN32
bool convert(const char *to, const char *from, char *outbuf, bool convert(const char *to, const char *from, char *outbuf,
size_t outbuf_size, char *inbuf, size_t inbuf_size) size_t outbuf_size, char *inbuf, size_t inbuf_size)
{ {
iconv_t cd = iconv_open(to, from); iconv_t cd = iconv_open(to, from);
#if defined(__FreeBSD__) || defined(__FreeBSD) #ifdef BSD_ICONV_USED
const char *inbuf_ptr = inbuf; const char *inbuf_ptr = inbuf;
#else #else
char *inbuf_ptr = inbuf; char *inbuf_ptr = inbuf;
@ -88,7 +94,7 @@ std::wstring utf8_to_wide(const std::string &input)
delete[] outbuf; delete[] outbuf;
return L"<invalid UTF-8 string>"; return L"<invalid UTF-8 string>";
} }
std::wstring out((wchar_t*)outbuf); std::wstring out((wchar_t *)outbuf);
delete[] inbuf; delete[] inbuf;
delete[] outbuf; delete[] outbuf;
@ -97,12 +103,15 @@ std::wstring utf8_to_wide(const std::string &input)
} }
#ifdef __ANDROID__ #ifdef __ANDROID__
// TODO: this is an ugly fix for wide_to_utf8 somehow not working on android // TODO: this is an ugly fix for wide_to_utf8 somehow not working on android
std::string wide_to_utf8(const std::wstring &input) std::string wide_to_utf8(const std::wstring &input)
{ {
return wide_to_narrow(input); return wide_to_narrow(input);
} }
#else
#else // __ANDROID__
std::string wide_to_utf8(const std::wstring &input) std::string wide_to_utf8(const std::wstring &input)
{ {
size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t); size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t);
@ -128,14 +137,18 @@ std::string wide_to_utf8(const std::wstring &input)
return out; return out;
} }
#endif
#else #endif // __ANDROID__
#else // _WIN32
std::wstring utf8_to_wide(const std::string &input) std::wstring utf8_to_wide(const std::string &input)
{ {
size_t outbuf_size = input.size() + 1; size_t outbuf_size = input.size() + 1;
wchar_t *outbuf = new wchar_t[outbuf_size]; wchar_t *outbuf = new wchar_t[outbuf_size];
memset(outbuf, 0, outbuf_size * sizeof(wchar_t)); memset(outbuf, 0, outbuf_size * sizeof(wchar_t));
MultiByteToWideChar(CP_UTF8, 0, input.c_str(), input.size(), outbuf, outbuf_size); MultiByteToWideChar(CP_UTF8, 0, input.c_str(), input.size(),
outbuf, outbuf_size);
std::wstring out(outbuf); std::wstring out(outbuf);
delete[] outbuf; delete[] outbuf;
return out; return out;
@ -146,18 +159,20 @@ std::string wide_to_utf8(const std::wstring &input)
size_t outbuf_size = (input.size() + 1) * 6; size_t outbuf_size = (input.size() + 1) * 6;
char *outbuf = new char[outbuf_size]; char *outbuf = new char[outbuf_size];
memset(outbuf, 0, outbuf_size); memset(outbuf, 0, outbuf_size);
WideCharToMultiByte(CP_UTF8, 0, input.c_str(), input.size(), outbuf, outbuf_size, NULL, NULL); WideCharToMultiByte(CP_UTF8, 0, input.c_str(), input.size(),
outbuf, outbuf_size, NULL, NULL);
std::string out(outbuf); std::string out(outbuf);
delete[] outbuf; delete[] outbuf;
return out; return out;
} }
#endif
#endif // _WIN32
// You must free the returned string! // You must free the returned string!
// The returned string is allocated using new // The returned string is allocated using new
wchar_t *narrow_to_wide_c(const char *str) wchar_t *narrow_to_wide_c(const char *str)
{ {
wchar_t* nstr = 0; wchar_t *nstr = NULL;
#if defined(_WIN32) #if defined(_WIN32)
int nResult = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR) str, -1, 0, 0); int nResult = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR) str, -1, 0, 0);
if (nResult == 0) { if (nResult == 0) {
@ -168,7 +183,7 @@ wchar_t *narrow_to_wide_c(const char *str)
} }
#else #else
size_t len = strlen(str); size_t len = strlen(str);
nstr = new wchar_t[len+1]; nstr = new wchar_t[len + 1];
std::wstring intermediate = narrow_to_wide(str); std::wstring intermediate = narrow_to_wide(str);
memset(nstr, 0, (len + 1) * sizeof(wchar_t)); memset(nstr, 0, (len + 1) * sizeof(wchar_t));