mirror of
https://github.com/minetest/irrlicht.git
synced 2025-06-28 06:20:21 +02:00
Drop _IRR_WCHAR_FILESYSTEM
never used and never worked for us.
This commit is contained in:
@ -332,16 +332,6 @@ you will not be able to use anything provided by the GUI Environment, including
|
||||
#undef _IRR_COMPILE_WITH_GUI_
|
||||
#endif
|
||||
|
||||
//! Define _IRR_WCHAR_FILESYSTEM to enable unicode filesystem support for the engine.
|
||||
/** This enables the engine to read/write from unicode filesystem. If you
|
||||
disable this feature, the engine behave as before (ansi). This is currently only supported
|
||||
for Windows based systems. You also have to set #define UNICODE for this to compile.
|
||||
*/
|
||||
//#define _IRR_WCHAR_FILESYSTEM
|
||||
#ifdef NO_IRR_WCHAR_FILESYSTEM
|
||||
#undef _IRR_WCHAR_FILESYSTEM
|
||||
#endif
|
||||
|
||||
//! Define _IRR_COMPILE_WITH_LIBJPEG_ to enable compiling the engine using libjpeg.
|
||||
/** This enables the engine to read jpeg images. If you comment this out,
|
||||
the engine will no longer read .jpeg images. */
|
||||
@ -529,10 +519,6 @@ ones. */
|
||||
|
||||
#endif // _IRR_WINDOWS_API_
|
||||
|
||||
#ifndef _IRR_WINDOWS_API_
|
||||
#undef _IRR_WCHAR_FILESYSTEM
|
||||
#endif
|
||||
|
||||
#if defined(_IRR_SOLARIS_PLATFORM_)
|
||||
#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
|
||||
#endif
|
||||
|
@ -73,22 +73,6 @@ typedef double f64;
|
||||
#define swprintf_irr _snwprintf
|
||||
#define snprintf_irr _snprintf
|
||||
#endif
|
||||
|
||||
// define the wchar_t type if not already built in.
|
||||
#ifdef _MSC_VER
|
||||
#ifndef _WCHAR_T_DEFINED
|
||||
//! A 16 bit wide character type.
|
||||
/**
|
||||
Defines the wchar_t-type.
|
||||
In VS6, its not possible to tell
|
||||
the standard compiler to treat wchar_t as a built-in type, and
|
||||
sometimes we just don't want to include the huge stdlib.h or wchar.h,
|
||||
so we'll use this.
|
||||
*/
|
||||
typedef unsigned short wchar_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif // wchar is not defined
|
||||
#endif // microsoft compiler
|
||||
#else
|
||||
#define swprintf_irr swprintf
|
||||
#define snprintf_irr snprintf
|
||||
@ -98,18 +82,8 @@ namespace irr
|
||||
{
|
||||
|
||||
//! Type name for character type used by the file system.
|
||||
/** Should the wide character version of the FileSystem be used it is a
|
||||
16 bit character variable. Used for Unicode Filesystem and Unicode strings.
|
||||
Else it is a 8 bit character variable. Used for ansi Filesystem and non-unicode
|
||||
strings
|
||||
*/
|
||||
#if defined(_IRR_WCHAR_FILESYSTEM)
|
||||
typedef wchar_t fschar_t;
|
||||
#define _IRR_TEXT(X) L##X
|
||||
#else
|
||||
typedef char fschar_t;
|
||||
#define _IRR_TEXT(X) X
|
||||
#endif
|
||||
|
||||
} // end namespace irr
|
||||
|
||||
|
@ -3015,11 +3015,7 @@ public:
|
||||
//! \return An io::path string containing the properly encoded string.
|
||||
io::path toPATH_s(const unicode::EUTF_ENDIAN endian = unicode::EUTFEE_NATIVE, const bool addBOM = false) const
|
||||
{
|
||||
#if defined(_IRR_WCHAR_FILESYSTEM)
|
||||
return toWCHAR_s(endian, addBOM);
|
||||
#else
|
||||
return toUTF8_s(addBOM);
|
||||
#endif
|
||||
}
|
||||
|
||||
//! Loads an unknown stream of data.
|
||||
|
Reference in New Issue
Block a user