diff options
-rw-r--r-- | src/lj_arch.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 240d0d16..baa7b663 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
@@ -79,6 +79,7 @@ | |||
79 | #elif defined(__linux__) | 79 | #elif defined(__linux__) |
80 | #define LUAJIT_OS LUAJIT_OS_LINUX | 80 | #define LUAJIT_OS LUAJIT_OS_LINUX |
81 | #elif defined(__MACH__) && defined(__APPLE__) | 81 | #elif defined(__MACH__) && defined(__APPLE__) |
82 | #include "TargetConditionals.h" | ||
82 | #define LUAJIT_OS LUAJIT_OS_OSX | 83 | #define LUAJIT_OS LUAJIT_OS_OSX |
83 | #elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ | 84 | #elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ |
84 | defined(__NetBSD__) || defined(__OpenBSD__) || \ | 85 | defined(__NetBSD__) || defined(__OpenBSD__) || \ |
@@ -117,10 +118,15 @@ | |||
117 | #define LJ_TARGET_LINUX (LUAJIT_OS == LUAJIT_OS_LINUX) | 118 | #define LJ_TARGET_LINUX (LUAJIT_OS == LUAJIT_OS_LINUX) |
118 | #define LJ_TARGET_OSX (LUAJIT_OS == LUAJIT_OS_OSX) | 119 | #define LJ_TARGET_OSX (LUAJIT_OS == LUAJIT_OS_OSX) |
119 | #define LJ_TARGET_BSD (LUAJIT_OS == LUAJIT_OS_BSD) | 120 | #define LJ_TARGET_BSD (LUAJIT_OS == LUAJIT_OS_BSD) |
120 | #define LJ_TARGET_IOS (LJ_TARGET_OSX && (LUAJIT_TARGET == LUAJIT_ARCH_ARM || LUAJIT_TARGET == LUAJIT_ARCH_ARM64)) | ||
121 | #define LJ_TARGET_POSIX (LUAJIT_OS > LUAJIT_OS_WINDOWS) | 121 | #define LJ_TARGET_POSIX (LUAJIT_OS > LUAJIT_OS_WINDOWS) |
122 | #define LJ_TARGET_DLOPEN LJ_TARGET_POSIX | 122 | #define LJ_TARGET_DLOPEN LJ_TARGET_POSIX |
123 | 123 | ||
124 | #if TARGET_OS_IPHONE | ||
125 | #define LJ_TARGET_IOS 1 | ||
126 | #else | ||
127 | #define LJ_TARGET_IOS 0 | ||
128 | #endif | ||
129 | |||
124 | #ifdef __CELLOS_LV2__ | 130 | #ifdef __CELLOS_LV2__ |
125 | #define LJ_TARGET_PS3 1 | 131 | #define LJ_TARGET_PS3 1 |
126 | #define LJ_TARGET_CONSOLE 1 | 132 | #define LJ_TARGET_CONSOLE 1 |