diff options
| author | ruki <[email protected]> | 2021-09-18 00:49:14 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-09-18 00:49:14 +0800 |
| commit | 56393682b43020adcff47de00fe7a011ba5f1584 (patch) | |
| tree | 3e339776870d8629cf41237463781e7bcfa9d1e1 | |
| parent | 80d619eab58df20b316b49c9db3616e9599da07b (diff) | |
improve lcurses
| -rw-r--r-- | core/src/lcurses/lcurses.c | 4 | ||||
| -rw-r--r-- | core/src/xmake/makefile | 2 | ||||
| -rw-r--r-- | core/src/xmake/prefix.h | 12 |
3 files changed, 15 insertions, 3 deletions
diff --git a/core/src/lcurses/lcurses.c b/core/src/lcurses/lcurses.c index 606a06cc3..f3bdf7244 100644 --- a/core/src/lcurses/lcurses.c +++ b/core/src/lcurses/lcurses.c @@ -336,7 +336,11 @@ static chtype lc_checkch(lua_State *L, int index) if (lua_type(L, index) == LUA_TSTRING) return *lua_tostring(L, index); +#ifdef USE_LUAJIT luaL_typerror(L, index, "chtype"); +#else + // TODO +#endif /* never executes */ return (chtype)0; } diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile index 84f3044b2..20bc49d82 100644 --- a/core/src/xmake/makefile +++ b/core/src/xmake/makefile @@ -152,9 +152,11 @@ xmake_INC_DIRS += \ ../sv/sv/include ifeq ($(BACKEND),luajit) xmake_INC_DIRS += ../luajit/luajit/src +xmake_CXFLAGS += -DUSE_LUAJIT endif ifeq ($(BACKEND),lua) xmake_INC_DIRS += ../lua/lua +xmake_CXFLAGS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 endif diff --git a/core/src/xmake/prefix.h b/core/src/xmake/prefix.h index f1287b5c9..f78b61127 100644 --- a/core/src/xmake/prefix.h +++ b/core/src/xmake/prefix.h @@ -32,9 +32,15 @@ # define LUA_API extern "C" # define LUALIB_API LUA_API #endif -#include "luajit.h" -#include "lualib.h" -#include "lauxlib.h" +#ifdef USE_LUAJIT +# include "luajit.h" +# include "lualib.h" +# include "lauxlib.h" +#else +# include "lua.h" +# include "lualib.h" +# include "lauxlib.h" +#endif /* ////////////////////////////////////////////////////////////////////////////////////// * private interfaces |