aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--backends/module.mk12
-rw-r--r--backends/platform/ds/arm9/makefile4
-rw-r--r--backends/platform/ds/arm9/source/dsmain.cpp1
-rw-r--r--backends/platform/ps2/Makefile.ps24
-rw-r--r--backends/platform/psp/Makefile4
-rw-r--r--backends/platform/psp/psp_main.cpp1
-rw-r--r--backends/plugins/ds/ds-provider.h4
-rw-r--r--backends/plugins/elf/arm-loader.cpp (renamed from backends/plugins/arm-loader.cpp)4
-rw-r--r--backends/plugins/elf/arm-loader.h (renamed from backends/plugins/arm-loader.h)2
-rw-r--r--backends/plugins/elf/elf-loader.cpp (renamed from backends/plugins/elf-loader.cpp)2
-rw-r--r--backends/plugins/elf/elf-loader.h (renamed from backends/plugins/elf-loader.h)2
-rw-r--r--backends/plugins/elf/elf-provider.cpp (renamed from backends/plugins/elf-provider.cpp)2
-rw-r--r--backends/plugins/elf/elf-provider.h (renamed from backends/plugins/elf-provider.h)2
-rw-r--r--backends/plugins/elf/elf32.h (renamed from backends/plugins/elf32.h)0
-rw-r--r--backends/plugins/elf/mips-loader.cpp (renamed from backends/plugins/mips-loader.cpp)2
-rw-r--r--backends/plugins/elf/mips-loader.h (renamed from backends/plugins/mips-loader.h)4
-rw-r--r--backends/plugins/elf/plugin.syms (renamed from backends/plugins/plugin.syms)0
-rw-r--r--backends/plugins/elf/ppc-loader.cpp (renamed from backends/plugins/ppc-loader.cpp)4
-rw-r--r--backends/plugins/elf/ppc-loader.h (renamed from backends/plugins/ppc-loader.h)2
-rw-r--r--backends/plugins/elf/shorts-segment-manager.cpp (renamed from backends/plugins/shorts-segment-manager.cpp)2
-rw-r--r--backends/plugins/elf/shorts-segment-manager.h (renamed from backends/plugins/shorts-segment-manager.h)2
-rw-r--r--backends/plugins/ps2/ps2-provider.h4
-rw-r--r--backends/plugins/psp/psp-provider.h4
-rw-r--r--backends/plugins/wii/wii-provider.h4
-rwxr-xr-xconfigure8
25 files changed, 39 insertions, 41 deletions
diff --git a/backends/module.mk b/backends/module.mk
index ab3d1efa47..eea7ec98d2 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -22,12 +22,12 @@ MODULE_OBJS := \
midi/timidity.o \
midi/dmedia.o \
midi/windows.o \
- plugins/elf-loader.o \
- plugins/mips-loader.o \
- plugins/shorts-segment-manager.o \
- plugins/arm-loader.o \
- plugins/ppc-loader.o \
- plugins/elf-provider.o \
+ plugins/elf/elf-loader.o \
+ plugins/elf/mips-loader.o \
+ plugins/elf/shorts-segment-manager.o \
+ plugins/elf/ppc-loader.o \
+ plugins/elf/arm-loader.o \
+ plugins/elf/elf-provider.o \
plugins/dc/dc-provider.o \
plugins/posix/posix-provider.o \
plugins/sdl/sdl-provider.o \
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 288ca206fc..b2512d788e 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -276,8 +276,8 @@ EXECUTABLE = scummvm.elf
PLUGIN_PREFIX =
PLUGIN_SUFFIX = .plg
-PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/ds/plugin.ld $(srcdir)/backends/plugins/plugin.syms $(EXECUTABLE)
-PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--target1-abs,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ds/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc -mthumb-interwork -mno-fpu#-Wl,--gc-sections -mno-crt0 $(DEVKITPRO)/devkitARM/arm-eabi/lib/ds_arm9_crt0.o
+PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/ds/plugin.ld $(srcdir)/backends/plugins/elf/plugin.syms $(EXECUTABLE)
+PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--target1-abs,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ds/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -lstdc++ -lc -mthumb-interwork -mno-fpu#-Wl,--gc-sections -mno-crt0 $(DEVKITPRO)/devkitARM/arm-eabi/lib/ds_arm9_crt0.o
MKDIR = mkdir -p
RM = rm -f
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index dc0b59e777..3e33b168ee 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -106,7 +106,6 @@
#include "engine.h"
#include "backends/plugins/ds/ds-provider.h"
-#include "backends/plugins/elf-provider.h"
#include "backends/fs/ds/ds-fs.h"
#include "base/version.h"
#include "common/util.h"
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index d5b0ae3e2a..7319fcb21d 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -88,9 +88,9 @@ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
# Variables for dynamic plugin building
PLUGIN_PREFIX =
PLUGIN_SUFFIX = .plg
-PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/plugin.syms elf/scummvm.elf
+PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/elf/plugin.syms elf/scummvm.elf
PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o
-PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,elf/scummvm.elf,-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc
+PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,elf/scummvm.elf,-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -lstdc++ -lc
BACKEND := ps2
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index 49455f6b97..96816348fd 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -87,8 +87,8 @@ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP
# Variables for dynamic plugin building
PLUGIN_PREFIX =
PLUGIN_SUFFIX = .plg
-PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/plugin.syms scummvm-psp.elf
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-psp.org.elf,-T$(srcdir)/backends/plugins/psp/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc
+PLUGIN_EXTRA_DEPS = $(srcdir)/backends/plugins/elf/plugin.syms scummvm-psp.elf
+PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-psp.org.elf,-T$(srcdir)/backends/plugins/psp/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -lstdc++ -lc
# PSP-specific variables
STRIP = psp-strip
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index dba9a8fc2b..41cf451323 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -37,7 +37,6 @@
#include <common/system.h>
#include <engines/engine.h>
#include <base/main.h>
-#include <base/plugins.h>
#include "backends/platform/psp/powerman.h"
#include "backends/platform/psp/thread.h"
diff --git a/backends/plugins/ds/ds-provider.h b/backends/plugins/ds/ds-provider.h
index 0013145358..c856937172 100644
--- a/backends/plugins/ds/ds-provider.h
+++ b/backends/plugins/ds/ds-provider.h
@@ -25,8 +25,8 @@
#if defined(DYNAMIC_MODULES) && defined(__DS__)
-#include "backends/plugins/elf-provider.h"
-#include "backends/plugins/arm-loader.h"
+#include "backends/plugins/elf/elf-provider.h"
+#include "backends/plugins/elf/arm-loader.h"
class DSPluginProvider : public ELFPluginProvider {
class DSPlugin : public ELFPlugin {
diff --git a/backends/plugins/arm-loader.cpp b/backends/plugins/elf/arm-loader.cpp
index 5c71c7e433..ab1129d34c 100644
--- a/backends/plugins/arm-loader.cpp
+++ b/backends/plugins/elf/arm-loader.cpp
@@ -25,8 +25,8 @@
#if defined(DYNAMIC_MODULES) && defined(ARM_TARGET)
-#include "backends/plugins/elf-loader.h"
-#include "backends/plugins/arm-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
+#include "backends/plugins/elf/arm-loader.h"
#include "common/debug.h"
diff --git a/backends/plugins/arm-loader.h b/backends/plugins/elf/arm-loader.h
index 24290d5c6d..52a3be5447 100644
--- a/backends/plugins/arm-loader.h
+++ b/backends/plugins/elf/arm-loader.h
@@ -25,7 +25,7 @@
#if defined(DYNAMIC_MODULES) && defined(ARM_TARGET)
-#include "backends/plugins/elf-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
class ARMDLObject : public DLObject {
protected:
diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf/elf-loader.cpp
index e1a1b8cef6..5ce8af6295 100644
--- a/backends/plugins/elf-loader.cpp
+++ b/backends/plugins/elf/elf-loader.cpp
@@ -42,7 +42,7 @@
#include <ogc/cache.h>
#endif
-#include "backends/plugins/elf-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
#include "common/debug.h"
#include "common/file.h"
diff --git a/backends/plugins/elf-loader.h b/backends/plugins/elf/elf-loader.h
index b5c0e1355d..6413c46cea 100644
--- a/backends/plugins/elf-loader.h
+++ b/backends/plugins/elf/elf-loader.h
@@ -30,8 +30,8 @@
#include <stddef.h>
+#include "backends/plugins/elf/elf32.h"
#include "backends/plugins/dynamic-plugin.h"
-#include "backends/plugins/elf32.h"
#include "common/stream.h"
diff --git a/backends/plugins/elf-provider.cpp b/backends/plugins/elf/elf-provider.cpp
index 997a43b653..9b42d4edd3 100644
--- a/backends/plugins/elf-provider.cpp
+++ b/backends/plugins/elf/elf-provider.cpp
@@ -25,7 +25,7 @@
#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
-#include "backends/plugins/elf-provider.h"
+#include "backends/plugins/elf/elf-provider.h"
#include "backends/plugins/dynamic-plugin.h"
#include "common/fs.h"
diff --git a/backends/plugins/elf-provider.h b/backends/plugins/elf/elf-provider.h
index df9c503674..f06621f5b7 100644
--- a/backends/plugins/elf-provider.h
+++ b/backends/plugins/elf/elf-provider.h
@@ -28,7 +28,7 @@
#ifndef BACKENDS_PLUGINS_ELF_PROVIDER_H
#define BACKENDS_PLUGINS_ELF_PROVIDER_H
-#include "backends/plugins/elf-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
#include "common/fs.h"
diff --git a/backends/plugins/elf32.h b/backends/plugins/elf/elf32.h
index c83093fed7..c83093fed7 100644
--- a/backends/plugins/elf32.h
+++ b/backends/plugins/elf/elf32.h
diff --git a/backends/plugins/mips-loader.cpp b/backends/plugins/elf/mips-loader.cpp
index 729c8f4224..642ea0427a 100644
--- a/backends/plugins/mips-loader.cpp
+++ b/backends/plugins/elf/mips-loader.cpp
@@ -25,7 +25,7 @@
#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
-#include "backends/plugins/mips-loader.h"
+#include "backends/plugins/elf/mips-loader.h"
#include "common/debug.h"
diff --git a/backends/plugins/mips-loader.h b/backends/plugins/elf/mips-loader.h
index 98bda5263f..a3210b5b12 100644
--- a/backends/plugins/mips-loader.h
+++ b/backends/plugins/elf/mips-loader.h
@@ -26,8 +26,8 @@
#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
-#include "backends/plugins/elf-loader.h"
-#include "backends/plugins/shorts-segment-manager.h"
+#include "backends/plugins/elf/elf-loader.h"
+#include "backends/plugins/elf/shorts-segment-manager.h"
class MIPSDLObject : public DLObject {
protected:
diff --git a/backends/plugins/plugin.syms b/backends/plugins/elf/plugin.syms
index 24ee1a19dc..24ee1a19dc 100644
--- a/backends/plugins/plugin.syms
+++ b/backends/plugins/elf/plugin.syms
diff --git a/backends/plugins/ppc-loader.cpp b/backends/plugins/elf/ppc-loader.cpp
index dcd5fceff1..21a9a6c8a0 100644
--- a/backends/plugins/ppc-loader.cpp
+++ b/backends/plugins/elf/ppc-loader.cpp
@@ -25,8 +25,8 @@
#if defined(DYNAMIC_MODULES) && defined(PPC_TARGET)
-#include "backends/plugins/elf-loader.h"
-#include "backends/plugins/ppc-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
+#include "backends/plugins/elf/ppc-loader.h"
#include "common/debug.h"
diff --git a/backends/plugins/ppc-loader.h b/backends/plugins/elf/ppc-loader.h
index 14d1f16720..13043924bb 100644
--- a/backends/plugins/ppc-loader.h
+++ b/backends/plugins/elf/ppc-loader.h
@@ -25,7 +25,7 @@
#if defined(DYNAMIC_MODULES) && defined(PPC_TARGET)
-#include "backends/plugins/elf-loader.h"
+#include "backends/plugins/elf/elf-loader.h"
class PPCDLObject : public DLObject {
protected:
diff --git a/backends/plugins/shorts-segment-manager.cpp b/backends/plugins/elf/shorts-segment-manager.cpp
index 17af17aa45..612ef19bbe 100644
--- a/backends/plugins/shorts-segment-manager.cpp
+++ b/backends/plugins/elf/shorts-segment-manager.cpp
@@ -25,7 +25,7 @@
#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
-#include "backends/plugins/shorts-segment-manager.h"
+#include "backends/plugins/elf/shorts-segment-manager.h"
#include "common/debug.h"
diff --git a/backends/plugins/shorts-segment-manager.h b/backends/plugins/elf/shorts-segment-manager.h
index bf583c021a..b3650562ed 100644
--- a/backends/plugins/shorts-segment-manager.h
+++ b/backends/plugins/elf/shorts-segment-manager.h
@@ -28,7 +28,7 @@
#ifndef SHORTS_SEGMENT_MANAGER_H
#define SHORTS_SEGMENT_MANAGER_H
-#include "backends/plugins/elf32.h"
+#include "backends/plugins/elf/elf32.h"
#include "common/singleton.h"
#include "common/list.h"
diff --git a/backends/plugins/ps2/ps2-provider.h b/backends/plugins/ps2/ps2-provider.h
index 809b88920a..00ddb4647e 100644
--- a/backends/plugins/ps2/ps2-provider.h
+++ b/backends/plugins/ps2/ps2-provider.h
@@ -25,8 +25,8 @@
#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
-#include "backends/plugins/elf-provider.h"
-#include "backends/plugins/mips-loader.h"
+#include "backends/plugins/elf/elf-provider.h"
+#include "backends/plugins/elf/mips-loader.h"
class PS2PluginProvider : public ELFPluginProvider {
class PS2Plugin : public ELFPlugin {
diff --git a/backends/plugins/psp/psp-provider.h b/backends/plugins/psp/psp-provider.h
index b7934179bf..18623e448c 100644
--- a/backends/plugins/psp/psp-provider.h
+++ b/backends/plugins/psp/psp-provider.h
@@ -28,8 +28,8 @@
#ifndef BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
#define BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
-#include "backends/plugins/elf-provider.h"
-#include "backends/plugins/mips-loader.h"
+#include "backends/plugins/elf/elf-provider.h"
+#include "backends/plugins/elf/mips-loader.h"
class PSPPluginProvider : public ELFPluginProvider {
class PSPPlugin : public ELFPlugin {
diff --git a/backends/plugins/wii/wii-provider.h b/backends/plugins/wii/wii-provider.h
index a299ff4add..deb143b02a 100644
--- a/backends/plugins/wii/wii-provider.h
+++ b/backends/plugins/wii/wii-provider.h
@@ -25,8 +25,8 @@
#if defined(DYNAMIC_MODULES) && defined(__WII__)
-#include "backends/plugins/elf-provider.h"
-#include "backends/plugins/ppc-loader.h"
+#include "backends/plugins/elf/elf-provider.h"
+#include "backends/plugins/elf/ppc-loader.h"
class WiiPluginProvider : public ELFPluginProvider {
class WiiPlugin : public ELFPlugin {
diff --git a/configure b/configure
index bf594c255a..f3eb9a268d 100755
--- a/configure
+++ b/configure
@@ -1957,7 +1957,7 @@ PLUGIN_PREFIX :=
PLUGIN_SUFFIX := .plg
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
CXXFLAGS += -DDYNAMIC_MODULES
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ds/plugin.ld -lstdc++ -lc -mthumb-interwork -mno-fpu -Wl,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms
+PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ds/plugin.ld -lstdc++ -lc -mthumb-interwork -mno-fpu -Wl,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
@@ -1991,7 +1991,7 @@ PLUGIN_PREFIX :=
PLUGIN_SUFFIX := .plg
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
CXXFLAGS += -DDYNAMIC_MODULES
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/wii/plugin.ld -Wl,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms
+PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/wii/plugin.ld -Wl,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
@@ -2062,7 +2062,7 @@ PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
CXXFLAGS += -DDYNAMIC_MODULES
LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T$(srcdir)/backends/plugins/ps2/main_prog.ld
PLUGIN_LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o
-PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc
+PLUGIN_LDFLAGS += -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms -lstdc++ -lc
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
@@ -2080,7 +2080,7 @@ PLUGIN_SUFFIX := .plg
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
CXXFLAGS += -DDYNAMIC_MODULES
LDFLAGS += -Wl,-T$(srcdir)/backends/platform/psp/main_prog.ld
-PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc -lm -Wl,--wrap,memcpy
+PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/plugins/elf/plugin.syms,-T$(srcdir)/backends/plugins/psp/plugin.ld -lstdc++ -lc -lm -Wl,--wrap,memcpy
PRE_OBJS_FLAGS := -Wl,--whole-archive
POST_OBJS_FLAGS := -Wl,--no-whole-archive
'
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 21:46:05 +0000