summaryrefslogtreecommitdiff
path: root/src/lj_arch.h
diff options
context:
space:
mode:
authorMike Pall <mike>2014-04-27 00:10:34 +0200
committerMike Pall <mike>2014-04-27 00:10:34 +0200
commite26dc8a21556078ad82afb33c452ea72e7c6d9f2 (patch)
tree446096c4a50e9b023c567464a1c2bb2aa285fdae /src/lj_arch.h
parentc8d1aff0bafcbfadb4a119685708c19788158cd6 (diff)
parent7a39be0ac45d8cd19c13bab38d4dda31ea599760 (diff)
downloadluajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.tar.gz
luajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.tar.bz2
luajit-e26dc8a21556078ad82afb33c452ea72e7c6d9f2.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
-rw-r--r--src/lj_arch.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h
index acdfe18b..10ff5529 100644
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -111,6 +111,11 @@
111#define NULL ((void*)0) 111#define NULL ((void*)0)
112#endif 112#endif
113 113
114#ifdef __psp2__
115#define LJ_TARGET_PSVITA 1
116#define LJ_TARGET_CONSOLE 1
117#endif
118
114#if _XBOX_VER >= 200 119#if _XBOX_VER >= 200
115#define LJ_TARGET_XBOX360 1 120#define LJ_TARGET_XBOX360 1
116#define LJ_TARGET_CONSOLE 1 121#define LJ_TARGET_CONSOLE 1