Only build Lua if HAVE_LUA is defined; define HAVE_LUA by default

Define RC_DISABLE_LUA if HAVE_LUA is not defined
This commit is contained in:
Andre Leiradella 2018-09-29 18:39:29 +01:00
parent 3aa200e3ba
commit 77df31256d
2 changed files with 11 additions and 3 deletions

View File

@ -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)

View File

@ -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