diff options
| -rw-r--r-- | core/src/lcurses/lcurses.c | 6 | ||||
| -rw-r--r-- | core/src/lcurses/makefile | 2 | ||||
| -rw-r--r-- | core/src/lua/makefile | 23 |
3 files changed, 31 insertions, 0 deletions
diff --git a/core/src/lcurses/lcurses.c b/core/src/lcurses/lcurses.c index 934dc2d1d..606a06cc3 100644 --- a/core/src/lcurses/lcurses.c +++ b/core/src/lcurses/lcurses.c @@ -65,9 +65,15 @@ Notes: #include <stdlib.h> #include <string.h> +#ifdef USE_LUAJIT #include "luajit.h" #include "lualib.h" #include "lauxlib.h" +#else +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +#endif #include <curses.h> #include <signal.h> diff --git a/core/src/lcurses/makefile b/core/src/lcurses/makefile index b981765a7..a0d6a6400 100644 --- a/core/src/lcurses/makefile +++ b/core/src/lcurses/makefile @@ -19,9 +19,11 @@ lcurses_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_ # includes ifeq ($(BACKEND),luajit) lcurses_INC_DIRS += ../luajit/luajit/src +lcurses_CXFLAGS += -DUSE_LUAJIT endif ifeq ($(BACKEND),lua) lcurses_INC_DIRS += ../lua/lua +lcurses_CXFLAGS += -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 endif # suffix diff --git a/core/src/lua/makefile b/core/src/lua/makefile index d2314c846..f66181209 100644 --- a/core/src/lua/makefile +++ b/core/src/lua/makefile @@ -47,6 +47,29 @@ lua_C_FILES += \ lua/ltests \ lua/ldo +# is windows? +iswin = +ifeq ($(PLAT),windows) + iswin = yes +endif +ifeq ($(PLAT),msys) + iswin = yes +endif +ifeq ($(PLAT),mingw) + iswin = yes +endif +ifeq ($(PLAT),cygwin) + iswin = yes +endif + +lua_CFLAGS := -std=c99 -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 \ + -Wno-error=string-plus-int +ifdef iswin +lua_CFLAGS += -DLUA_USE_WINDOWS +else +lua_CFLAGS += -DLUA_USE_LINUX +endif + # use given system library? lua_C_FILES := $(if $(findstring lua,$(base_LIBNAMES)),,$(lua_C_FILES)) lua_ASM_FILES := $(if $(findstring lua,$(base_LIBNAMES)),,$(lua_ASM_FILES)) |