Merge branch 'master' into v2.1

2014-04-27 00:10:34 +02:00
parent c8d1aff0ba 7a39be0ac4
commit e26dc8a215
8 changed files with 158 additions and 28 deletions
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -111,6 +111,11 @@
 #define NULL ((void*)0)
 #endif

+#ifdef __psp2__
+#define LJ_TARGET_PSVITA	1
+#define LJ_TARGET_CONSOLE	1
+#endif
+
 #if _XBOX_VER >= 200
 #define LJ_TARGET_XBOX360	1
 #define LJ_TARGET_CONSOLE	1