[Scummvm-git-logs] scummvm master -> 630d45332f2b15e02f5e5f637b778e85e6015f1f

[spleen1981]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
630d45332f LIBRETRO: BUILD: fix noengine target


Commit: 630d45332f2b15e02f5e5f637b778e85e6015f1f
    https://github.com/scummvm/scummvm/commit/630d45332f2b15e02f5e5f637b778e85e6015f1f
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2024-09-23T10:51:35+02:00

Commit Message:
LIBRETRO: BUILD: fix noengine target

Changed paths:
    backends/platform/libretro/Makefile
    backends/platform/libretro/Makefile.common
    backends/platform/libretro/scripts/configure_engines.sh


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index 420a520c804..2d5d838dcc4 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -640,7 +640,7 @@ clean:
 	$(HIDE)$(RM_REC) libtemp $(MODULES)
 	$(HIDE)$(RM) libnx-ln
 	$(HIDE)$(RM) scummvm.zip  $(TARGET_NAME)_libretro.* script.mri config.mk.engines.lite ScummVM.dat
-	$(HIDE)$(RM) $(ROOT_PATH)/shared_modules.mk
+	$(HIDE)$(RM) $(ROOT_PATH)/shared_modules.mk $(SCUMMVM_PATH)/engines/engines.mk $(SCUMMVM_PATH)/engines/detection_table.h $(SCUMMVM_PATH)/engines/plugins_table.h
 
 # Include the dependency tracking files.
 -include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index f9e1af97bbb..a431309afb4 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -194,7 +194,11 @@ endif
 
 # Engine modules
 # Following script generates configuration engines files (build/config.mk.engines, engines/engines.mk, engines/plugins_table.h, engines/detection_table.h) from actual source in $(SCUMMVM_PATH).
-ifeq (,$(filter clean datafiles coreinfo noengine,$(MAKECMDGOALS)))
+ifneq (,$(filter noengine,$(MAKECMDGOALS)))
+   LITE := 2
+endif
+
+ifeq (,$(filter clean datafiles coreinfo,$(MAKECMDGOALS)))
 $(info Configuring ScummVM engines...)
 ifneq ($(shell cd $(SCRIPTS_PATH); ./configure_engines.sh $(ROOT_PATH) $(SCUMMVM_PATH) $(NO_WIP) $(STATIC_LINKING) $(LITE) $(UNAVAILABLE_DEPS)),0)
    $(error Configuring ScummVM engines failed)
diff --git a/backends/platform/libretro/scripts/configure_engines.sh b/backends/platform/libretro/scripts/configure_engines.sh
index c8d99fd74de..43a355bd395 100755
--- a/backends/platform/libretro/scripts/configure_engines.sh
+++ b/backends/platform/libretro/scripts/configure_engines.sh
@@ -21,7 +21,7 @@
 # $2     [REQ] SCUMMVM_PATH
 # $3     [REQ] NO_WIP [0,1]
 # $4     [REQ] STATIC_LINKING [0,1]
-# $5     [REQ] LITE [0,1]
+# $5     [REQ] LITE [0,1,2]
 # $[...] [OPT] Engines dependencies not available
 
 set -e
@@ -58,8 +58,9 @@ tot_deps=""
 [ $NO_WIP -ne 1 ] && engine_enable_all
 
 # Test LITE
+[ $LITE -ne 0 ] && engine_disable_all
+
 if [ $LITE -eq 1 ] ; then
-	engine_disable_all
 	for eng in $(cat "${BUILD_PATH}"/lite_engines.list) ; do
 		engine_enable "$eng"
 	done