mirror of https://github.com/odrling/Aegisub
Use compiler-specific defines when building universal for OS X to detect correct endianness and avoid using dynamic endian code for no reason.
Originally committed to SVN as r2230.
This commit is contained in:
parent
d14d6b4b36
commit
a4fc3e8b13
|
@ -41,17 +41,31 @@
|
||||||
// Sanity check
|
// Sanity check
|
||||||
|
|
||||||
#ifndef HAVE_LITTLE_ENDIAN
|
#ifndef HAVE_LITTLE_ENDIAN
|
||||||
#ifndef HAVE_BIG_ENDIAN
|
# ifndef HAVE_BIG_ENDIAN
|
||||||
#ifndef HAVE_DYNAMIC_ENDIAN
|
// We neither have big nor little endian from configuration
|
||||||
#define HAVE_DYNAMIC_ENDIAN
|
# ifdef HAVE_UNIVERSAL_ENDIAN
|
||||||
#endif
|
// But this is an OS X system building a universal binary
|
||||||
#endif
|
// Apple's GCC defines _BIG_ENDIAN when building for PPC
|
||||||
#endif
|
# ifdef _BIG_ENDIAN
|
||||||
|
# define HAVE_BIG_ENDIAN
|
||||||
|
# else
|
||||||
|
# define HAVE_LITTLE_ENDIAN
|
||||||
|
# endif
|
||||||
|
# undef HAVE_DYNAMIC_ENDIAN
|
||||||
|
# else // !HAVE_UNIVERSAL_ENDIAN
|
||||||
|
// We aren't building an OS X universal binary
|
||||||
|
// Use the dynamic endian code
|
||||||
|
# ifndef HAVE_DYNAMIC_ENDIAN
|
||||||
|
# define HAVE_DYNAMIC_ENDIAN
|
||||||
|
# endif
|
||||||
|
# endif //HAVE_UNIVERSAL_ENDIAN
|
||||||
|
# endif // HAVE_BIG_ENDIAN
|
||||||
|
#endif // HAVE_LITTLE_ENDIAN
|
||||||
|
|
||||||
#ifdef HAVE_LITTLE_ENDIAN
|
#ifdef HAVE_LITTLE_ENDIAN
|
||||||
#ifdef HAVE_BIG_ENDIAN
|
# ifdef HAVE_BIG_ENDIAN
|
||||||
#error You cannot have both HAVE_LITTLE_ENDIAN and HAVE_BIG_ENDIAN defined at the same time
|
# error You cannot have both HAVE_LITTLE_ENDIAN and HAVE_BIG_ENDIAN defined at the same time
|
||||||
#endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue