Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 48 additions & 42 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,54 @@ ifeq ($(HAVE_CHEATS), 1)
OBJ += cheat_manager.o
endif

ifeq ($(HAVE_ICONV), 1)
DEFINES += -DHAVE_ICONV
LIBS += -liconv
endif

ifeq ($(HAVE_LUA), 1)
#CFLAGS += -std=gnu99
DEFINES += -DHAVE_LUA -DLUA_32BITS
INCLUDE_DIRS += -Ideps/lua/src
OBJ += deps/lua/src/lapi.o \
deps/lua/src/lcode.o \
deps/lua/src/lctype.o \
deps/lua/src/ldebug.o \
deps/lua/src/ldo.o \
deps/lua/src/ldump.o \
deps/lua/src/lfunc.o \
deps/lua/src/lgc.o \
deps/lua/src/llex.o \
deps/lua/src/lmem.o \
deps/lua/src/lobject.o \
deps/lua/src/lopcodes.o \
deps/lua/src/lparser.o \
deps/lua/src/lstate.o \
deps/lua/src/lstring.o \
deps/lua/src/ltable.o \
deps/lua/src/ltm.o \
deps/lua/src/lundump.o \
deps/lua/src/lvm.o \
deps/lua/src/lzio.o \
deps/lua/src/lauxlib.o \
deps/lua/src/lbaselib.o \
deps/lua/src/lbitlib.o \
deps/lua/src/lcorolib.o \
deps/lua/src/ldblib.o \
deps/lua/src/liolib.o \
deps/lua/src/lmathlib.o \
deps/lua/src/loslib.o \
deps/lua/src/lstrlib.o \
deps/lua/src/ltablib.o \
deps/lua/src/lutf8lib.o \
deps/lua/src/loadlib.o \
deps/lua/src/linit.o \
lua_manager.o
LIBS += -lm
else
DEFINES += -DRC_DISABLE_LUA
endif

ifeq ($(HAVE_CORE_INFO_CACHE), 1)
DEFINES += -DHAVE_CORE_INFO_CACHE
endif
Expand Down Expand Up @@ -2457,48 +2505,6 @@ ifeq ($(HAVE_NETWORKING), 1)
DEFINES += -DHAVE_CHEEVOS_RVZ
OBJ += cheevos/cheevos_rvz.o
endif

ifeq ($(HAVE_LUA), 1)
DEFINES += -DHAVE_LUA \
-DLUA_32BITS
INCLUDE_DIRS += -Ideps/lua/src
OBJ += deps/lua/src/lapi.o \
deps/lua/src/lcode.o \
deps/lua/src/lctype.o \
deps/lua/src/ldebug.o \
deps/lua/src/ldo.o \
deps/lua/src/ldump.o \
deps/lua/src/lfunc.o \
deps/lua/src/lgc.o \
deps/lua/src/llex.o \
deps/lua/src/lmem.o \
deps/lua/src/lobject.o \
deps/lua/src/lopcodes.o \
deps/lua/src/lparser.o \
deps/lua/src/lstate.o \
deps/lua/src/lstring.o \
deps/lua/src/ltable.o \
deps/lua/src/ltm.o \
deps/lua/src/lundump.o \
deps/lua/src/lvm.o \
deps/lua/src/lzio.o \
deps/lua/src/lauxlib.o \
deps/lua/src/lbaselib.o \
deps/lua/src/lbitlib.o \
deps/lua/src/lcorolib.o \
deps/lua/src/ldblib.o \
deps/lua/src/liolib.o \
deps/lua/src/lmathlib.o \
deps/lua/src/loslib.o \
deps/lua/src/lstrlib.o \
deps/lua/src/ltablib.o \
deps/lua/src/lutf8lib.o \
deps/lua/src/loadlib.o \
deps/lua/src/linit.o
else
DEFINES += -DRC_DISABLE_LUA
endif

endif

ifeq ($(HAVE_DISCORD), 1)
Expand Down
4 changes: 4 additions & 0 deletions configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -2289,6 +2289,10 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("quick_menu_show_game_ai", &settings->bools.quick_menu_show_game_ai, true, 1, false);
#endif

#ifdef HAVE_LUA
SETTING_BOOL("lua_scripts_sandboxed", &settings->bools.lua_scripts_sandboxed, true, 1, false);
#endif

*size = count;

return tmp;
Expand Down
4 changes: 4 additions & 0 deletions configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,10 @@ typedef struct settings
bool game_ai_show_debug;
#endif

#ifdef HAVE_LUA
bool lua_scripts_sandboxed;
#endif

#ifdef HAVE_SMBCLIENT
bool smb_client_enable;
#endif
Expand Down
5 changes: 5 additions & 0 deletions gfx/gfx_widgets.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "../configuration.h"
#include "../file_path_special.h"
#include "../msg_hash.h"
#include "../lua_manager.h"

#include "../tasks/task_content.h"
#include "../tasks/tasks_internal.h"
Expand Down Expand Up @@ -1915,6 +1916,10 @@ void gfx_widgets_frame(void *data)
font_driver_bind_block(p_dispwidget->gfx_widget_fonts.bold.font, NULL);
font_driver_bind_block(p_dispwidget->gfx_widget_fonts.msg_queue.font, NULL);

#if defined(HAVE_LUA) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
lua_draw_gfxs_loop();
#endif

if (video_st->current_video && video_st->current_video->set_viewport)
video_st->current_video->set_viewport(
video_st->data, video_width, video_height, false, true);
Expand Down
7 changes: 7 additions & 0 deletions griffin/griffin.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ ACHIEVEMENTS

#endif

/*============================================================
LUA SCRIPTING
============================================================ */
#ifdef HAVE_LUA
#include "../lua_manager.c"
#endif

/*============================================================
MD5
============================================================ */
Expand Down
Loading
Loading