LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-19 12:14:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated to latest love-android revision (aada9b59bcdf)

Browse Source
This commit is contained in:
fysx
2014-01-20 10:09:26 +01:00
parent ab51b4cc9b
commit ba5f33f9aa
45 changed files with 1112 additions and 50480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/love/src/common/config.h
+7 -1
View File
@@ -26,7 +26,11 @@
# define LOVE_WINDOWS 1
#endif
#if defined(linux) || defined(__linux) || defined(__linux__)
# define LOVE_LINUX 1
# if defined(__ANDROID__)
# define LOVE_ANDROID 1
# else
# define LOVE_LINUX 1
# endif
#endif
#if defined(__APPLE__)
# define LOVE_MACOSX 1
@@ -123,6 +127,8 @@
# define LOVE_ENABLE_THREAD_SDL
# define LOVE_ENABLE_TIMER
# define LOVE_ENABLE_TIMER_SDL
# define LOVE_ENABLE_TOUCH
# define LOVE_ENABLE_TOUCH_SDL
# define LOVE_ENABLE_UTF8
# define LOVE_ENABLE_WINDOW
# define LOVE_ENABLE_WINDOW_SDL
jni/love/src/common/runtime.cpp
+1 -1
View File
@@ -464,7 +464,7 @@ void luax_pushtype(lua_State *L, const char *name, bits flags, love::Object *dat
bool luax_istype(lua_State *L, int idx, love::bits type)
{
if (lua_isuserdata(L, idx) == 0)
if (lua_type(L, idx) != LUA_TUSERDATA)
return false;
return ((((Proxy *)lua_touserdata(L, idx))->flags & type) == type);
jni/love/src/common/runtime.h
+1 -1
View File
@@ -401,7 +401,7 @@ extern "C" { // Also called from luasocket
template <typename T>
T *luax_checktype(lua_State *L, int idx, const char *name, love::bits type)
{
if (lua_isuserdata(L, idx) == 0)
if (lua_type(L, idx) != LUA_TUSERDATA)
luax_typerror(L, idx, name);
Proxy *u = (Proxy *)lua_touserdata(L, idx);