[Scummvm-git-logs] scummvm master -> 3b17472f7d84e97abde0c1b00b5d01922f276771

[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:
3b17472f7d TETRAEDGE: BUILD: remove obb_archive.o from DETECT_OBJS


Commit: 3b17472f7d84e97abde0c1b00b5d01922f276771
    https://github.com/scummvm/scummvm/commit/3b17472f7d84e97abde0c1b00b5d01922f276771
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-02-05T13:12:52+01:00

Commit Message:
TETRAEDGE: BUILD: remove obb_archive.o from DETECT_OBJS

Changed paths:
    backends/platform/libretro/jni/Android.mk
    engines/tetraedge/module.mk


diff --git a/backends/platform/libretro/jni/Android.mk b/backends/platform/libretro/jni/Android.mk
index 8422d9792d4..5cb6ab7f035 100644
--- a/backends/platform/libretro/jni/Android.mk
+++ b/backends/platform/libretro/jni/Android.mk
@@ -22,10 +22,6 @@ include $(addprefix $(SCUMMVM_PATH)/, $(addsuffix /module.mk,$(MODULES)))
 
 OBJS_MODULES := $(addprefix $(SCUMMVM_PATH)/, $(foreach MODULE,$(MODULES),$(MODULE_OBJS-$(MODULE))))
 
-#TODO:
-# -Workaround to fix a linker error for tetraengine adding the following twice (both in DETECT_OBJS and MODULE_OBJS)
-DETECT_OBJS := $(filter-out engines/tetraedge/obb_archive.o, $(DETECT_OBJS))
-
 #TODO:
 # -O2 or higher causes segmentation fault with some engines (e.g. hopkins)
 # -Fortify triggers abort with some engines (e.g. sword25)
@@ -39,7 +35,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE          := retro
 LOCAL_MODULE_FILENAME := libretro
 LOCAL_SRC_FILES       := $(DETECT_OBJS:%.o=$(SCUMMVM_PATH)/%.cpp)  $(OBJS_DEPS:%.o=%.c) $(OBJS_MODULES:%.o=%.cpp) $(OBJS:%.o=%.cpp)
-
 LOCAL_C_INCLUDES      := $(subst -I,,$(INCLUDES))
 LOCAL_CPPFLAGS        := $(COREFLAGS) -std=c++11
 LOCAL_CFLAGS          := $(COREFLAGS)
diff --git a/engines/tetraedge/module.mk b/engines/tetraedge/module.mk
index 4ad639e9a97..913872d7056 100644
--- a/engines/tetraedge/module.mk
+++ b/engines/tetraedge/module.mk
@@ -172,4 +172,4 @@ endif
 include $(srcdir)/rules.mk
 
 # Detection objects
-DETECT_OBJS += $(MODULE)/detection.o $(MODULE)/obb_archive.o
+DETECT_OBJS += $(MODULE)/detection.o