From 77df31256dbc30569ef5a5e7385de3bc640cd36f Mon Sep 17 00:00:00 2001 From: Andre Leiradella Date: Sat, 29 Sep 2018 18:39:29 +0100 Subject: [PATCH] Only build Lua if HAVE_LUA is defined; define HAVE_LUA by default Define RC_DISABLE_LUA if HAVE_LUA is not defined --- Makefile.common | 13 ++++++++++--- qb/config.params.sh | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index e92b98fe32..5d3bf24244 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1629,7 +1629,13 @@ ifeq ($(HAVE_NETWORKING), 1) deps/rcheevos/src/rcheevos/alloc.o \ deps/rcheevos/src/rcheevos/format.o \ deps/rcheevos/src/rurl/url.o \ - deps/lua/src/lapi.o \ + $(LIBRETRO_COMM_DIR)/utils/md5.o + endif + + ifeq ($(HAVE_LUA), 1) + DEFINES += -DHAVE_LUA \ + -Ideps/lua/src + OBJ += deps/lua/src/lapi.o \ deps/lua/src/lcode.o \ deps/lua/src/lctype.o \ deps/lua/src/ldebug.o \ @@ -1661,8 +1667,9 @@ ifeq ($(HAVE_NETWORKING), 1) deps/lua/src/ltablib.o \ deps/lua/src/lutf8lib.o \ deps/lua/src/loadlib.o \ - deps/lua/src/linit.o \ - $(LIBRETRO_COMM_DIR)/utils/md5.o + deps/lua/src/linit.o + else + DEFINES += -DRC_DISABLE_LUA endif ifeq ($(HAVE_DISCORD), 1) diff --git a/qb/config.params.sh b/qb/config.params.sh index ecece0df64..2b0af8fba7 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -110,6 +110,7 @@ HAVE_QT=auto # Qt companion support C89_QT=no HAVE_XSHM=no # XShm video driver support HAVE_CHEEVOS=yes # Retro Achievements +HAVE_LUA=yes # Lua support (for Retro Achievements) HAVE_DISCORD=yes # Discord Integration C89_DISCORD=no HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines