More mac fixups.
This commit is contained in:
Ben Vanik
@@ -27,109 +27,106 @@ XE_CPU: 32BIT | 64BIT | BIGENDIAN | LITTLEENDIAN
|
||||
#include <TargetConditionals.h>
|
||||
#endif
|
||||
|
||||
#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED ) || \
|
||||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE ) || \
|
||||
#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || \
|
||||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
|
||||
(defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
|
||||
|
||||
#define XE_PLATFORM_IOS 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_IOS 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
|
||||
// EMBEDDED *and* SIMULATOR
|
||||
#define XE_PROFILE_SIMULATOR 1
|
||||
#define XE_PROFILE_SIMULATOR 1
|
||||
#endif
|
||||
|
||||
#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
|
||||
|
||||
#define XE_PLATFORM_OSX 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_OSX 1
|
||||
#define XE_LIKE_OSX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(_XBOX)
|
||||
|
||||
#define XE_PLATFORM_XBOX360 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_XBOX360 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(_WIN32_WCE)
|
||||
|
||||
#define XE_PLATFORM_WINCE 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_WINCE 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(__CYGWIN__)
|
||||
|
||||
#define XE_PLATFORM_CYGWIN 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_CYGWIN 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(WIN32) || defined(_WIN32)
|
||||
|
||||
#define XE_PLATFORM_WIN32 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_WIN32 1
|
||||
#define XE_LIKE_WIN32 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#elif defined(ANDROID)
|
||||
|
||||
#define XE_PLATFORM_ANDROID 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
#define XE_PLATFORM_ANDROID 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_EMBEDDED 1
|
||||
|
||||
#elif defined(__native_client__)
|
||||
|
||||
#define XE_PLATFORM_NACL 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_NACL 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#else
|
||||
|
||||
#define XE_PLATFORM_UNIX 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
#define XE_PLATFORM_UNIX 1
|
||||
#define XE_LIKE_POSIX 1
|
||||
#define XE_PROFILE_DESKTOP 1
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
#define XE_COMPILER_CLANG 1
|
||||
#define XE_COMPILER_CLANG 1
|
||||
#elif defined(__GNUC__)
|
||||
#define XE_COMPILER_GNUC 1
|
||||
#define XE_COMPILER_GNUC 1
|
||||
#elif defined(_MSC_VER)
|
||||
#define XE_COMPILER_MSVC 1
|
||||
#define XE_COMPILER_MSVC 1
|
||||
#elif defined(__MINGW32)
|
||||
#define XE_COMPILER_MINGW32 1
|
||||
#define XE_COMPILER_MINGW32 1
|
||||
#elif defined(__INTEL_COMPILER)
|
||||
#define XE_COMPILER_INTEL 1
|
||||
#define XE_COMPILER_INTEL 1
|
||||
#else
|
||||
#define XE_COMPILER_UNKNOWN 1
|
||||
#define XE_COMPILER_UNKNOWN 1
|
||||
#endif
|
||||
|
||||
#if defined(__ia64__) || defined(_M_IA64) || \
|
||||
defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__arch64__) || \
|
||||
defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64) || \
|
||||
defined(__LP64__) || defined(__LLP64) || \
|
||||
defined(_WIN64) || \
|
||||
(__WORDSIZE == 64)
|
||||
#define XE_CPU_64BIT 1
|
||||
#if defined(__ia64__) || defined(_M_IA64) || defined(__ppc64__) || \
|
||||
defined(__PPC64__) || defined(__arch64__) || defined(__x86_64__) || \
|
||||
defined(_M_X64) || defined(_M_AMD64) || defined(__LP64__) || \
|
||||
defined(__LLP64) || defined(_WIN64) || (__WORDSIZE == 64)
|
||||
#define XE_CPU_64BIT 1
|
||||
#else
|
||||
#define XE_CPU_32BIT 1
|
||||
#define XE_CPU_32BIT 1
|
||||
#endif // [64bit flags]
|
||||
|
||||
#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(_M_PPC) || defined(__PPC) || \
|
||||
defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__ARMEB__) || defined(__THUMBEB__) || \
|
||||
defined(__AARCH64EB__) || \
|
||||
#if defined(__ppc__) || defined(__PPC__) || defined(__powerpc__) || \
|
||||
defined(__powerpc) || defined(__POWERPC__) || defined(_M_PPC) || \
|
||||
defined(__PPC) || defined(__ppc64__) || defined(__PPC64__) || \
|
||||
defined(__ARMEB__) || defined(__THUMBEB__) || defined(__AARCH64EB__) || \
|
||||
defined(__BIG_ENDIAN) || defined(__BIG_ENDIAN__)
|
||||
#define XE_CPU_BIGENDIAN 1
|
||||
#define XE_CPU_BIGENDIAN 1
|
||||
#else
|
||||
#define XE_CPU_LITTLEENDIAN 1
|
||||
#define XE_CPU_LITTLEENDIAN 1
|
||||
#endif // [big endian flags]
|
||||
|
||||
#if XE_CPU_32BIT
|
||||
#define XE_ALIGNMENT 8
|
||||
#define XE_ALIGNMENT 8
|
||||
#else
|
||||
#define XE_ALIGNMENT 16
|
||||
#define XE_ALIGNMENT 16
|
||||
#endif // 32BIT
|
||||
|
||||
#if XE_PLATFORM_WINCE || XE_PLATFORM_WIN32
|
||||
@@ -168,7 +165,7 @@ const char path_separator = '\\';
|
||||
const size_t max_path = _MAX_PATH;
|
||||
#else
|
||||
const char path_separator = '/';
|
||||
const size_t max_path = PATH_MAX;
|
||||
const size_t max_path = 1024; // PATH_MAX
|
||||
#endif // WIN32
|
||||
|
||||
} // namespace poly
|
||||
|
||||
Reference in New Issue
Block a user