diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/lcurses/lcurses.c | 18 | ||||
| -rw-r--r-- | core/src/lcurses/xmake.lua | 7 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 7 | ||||
| -rw-r--r-- | core/xmake.lua | 16 |
4 files changed, 25 insertions, 23 deletions
diff --git a/core/src/lcurses/lcurses.c b/core/src/lcurses/lcurses.c index 026d737e7..704c8fab3 100644 --- a/core/src/lcurses/lcurses.c +++ b/core/src/lcurses/lcurses.c @@ -276,7 +276,7 @@ static void lcw_new(lua_State *L, WINDOW *nw) { if (nw) { - WINDOW **w = lua_newuserdata(L, sizeof(WINDOW*)); + WINDOW **w = (WINDOW**)lua_newuserdata(L, sizeof(WINDOW*)); luaL_getmetatable(L, WINDOWMETA); lua_setmetatable(L, -2); *w = nw; @@ -363,7 +363,7 @@ static chstr* chstr_new(lua_State *L, int len) lua_error(L); } { - chstr *cs = lua_newuserdata(L, CHSTR_SIZE(len)); + chstr *cs = (chstr*)lua_newuserdata(L, CHSTR_SIZE(len)); luaL_getmetatable(L, CHSTRMETA); lua_setmetatable(L, -2); cs->len = len; @@ -410,9 +410,9 @@ static int chstr_set_str(lua_State *L) if (index < 0) return 0; - while (rep-- > 0 && index <= cs->len) + while (rep-- > 0 && index <= (int)cs->len) { - if (index + len - 1 > cs->len) + if (index + len - 1 > (int)cs->len) len = cs->len - index + 1; if (map_output) @@ -457,7 +457,7 @@ static int chstr_set_ch(lua_State *L) while (rep-- > 0) { - if (index < 0 || index >= cs->len) + if (index < 0 || index >= (int)cs->len) return 0; if (map_output && ch <= 255) @@ -477,7 +477,7 @@ static int chstr_get(lua_State *L) int index = luaL_checkint(L, 2); chtype ch; - if (index < 0 || index >= cs->len) + if (index < 0 || index >= (int)cs->len) return 0; ch = cs->str[index]; @@ -669,7 +669,9 @@ static int lc_initscr(lua_State *L) init_ascii_map(); /* install cleanup handler to help in debugging and screen trashing */ +#ifndef PDCURSES atexit(cleanup); +#endif /* disable interrupt signal signal(SIGINT, SIG_IGN); signal(SIGBREAK, SIG_IGN); @@ -1318,7 +1320,7 @@ static int lcw_waddchnstr(lua_State *L) int n = luaL_optint(L, 3, -1); chstr *cs = lc_checkchstr(L, 2); - if (n < 0 || n > cs->len) + if (n < 0 || n > (int)cs->len) n = cs->len; lua_pushboolean(L, B(waddchnstr(w, cs->str, n))); @@ -1333,7 +1335,7 @@ static int lcw_mvwaddchnstr(lua_State *L) int n = luaL_optint(L, 5, -1); chstr *cs = lc_checkchstr(L, 4); - if (n < 0 || n > cs->len) + if (n < 0 || n > (int)cs->len) n = cs->len; lua_pushboolean(L, B(mvwaddchnstr(w, y, x, cs->str, n))); diff --git a/core/src/lcurses/xmake.lua b/core/src/lcurses/xmake.lua index f7357711a..5bb30597d 100644 --- a/core/src/lcurses/xmake.lua +++ b/core/src/lcurses/xmake.lua @@ -20,4 +20,9 @@ target("lcurses") add_files("*.c") -- add options - add_options("curses") + if is_plat("windows") then + add_defines("PDCURSES", "XM_CONFIG_API_HAVE_CURSES") + add_includedirs("../pdcurses") + else + add_options("curses") + end diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index 3cd34145c..54b933102 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -26,6 +26,11 @@ target("xmake") add_files("**.c") -- add readline - add_options("curses", "readline") + add_options("readline") + if is_plat("windows") then + add_defines("XM_CONFIG_API_HAVE_CURSES") + else + add_options("curses") + end diff --git a/core/xmake.lua b/core/xmake.lua index 8a71c57f1..edf65dbe7 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -30,15 +30,9 @@ add_cxflags("-fomit-frame-pointer") -- for the windows platform (msvc) if is_plat("windows") then - - -- add some defines only for windows - add_defines("NOCRYPT", "NOGDI") - - -- link libcmt.lib add_cxflags("-MT") - - -- no msvcrt.lib add_ldflags("-nodefaultlib:\"msvcrt.lib\"") + add_links("kernel32", "user32", "gdi32") end -- for mode coverage @@ -56,13 +50,9 @@ option_end() -- the curses option option("curses") + add_links("curses") + add_cincludes("curses.h") add_defines("XM_CONFIG_API_HAVE_CURSES") - if is_plat("windows") then - add_defines("PDCURSES") - else - add_links("curses") - add_cincludes("curses.h") - end option_end() -- add projects |