From 520c0a40098a9687f4d85343267cda9c5b5c971b Mon Sep 17 00:00:00 2001
From: Tony Puccinelli
Date: Tue, 3 Aug 2010 22:08:32 +0000
Subject: added checks for ELF_LOADER_TARGET before including the elf plugin
 provider

svn-id: r51716
---
 backends/platform/ds/arm9/makefile | 2 +-
 backends/platform/ps2/Makefile.ps2 | 2 +-
 backends/platform/psp/Makefile     | 2 +-
 backends/plugins/elf-loader.cpp    | 4 ++--
 backends/plugins/elf-provider.cpp  | 4 ++--
 backends/plugins/elf-provider.h    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index d86a019452..adcf24f5ff 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -238,7 +238,7 @@ CXXFLAGS=	$(CFLAGS) -Wno-non-virtual-dtor -Wno-unknown-pragmas -Wno-reorder  \
 
 
 ASFLAGS = -mcpu=arm9tdmi -mthumb-interwork
-DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DARM
+DEFINES += -D__DS__ -DNDS -DARM9 -DNONSTANDARD_PORT -DDISABLE_FANCY_THEMES -DVECTOR_RENDERER_FORMAT=1555 -DDISABLE_DOSBOX_OPL -DDISABLE_DEFAULT_SAVEFILEMANAGER -DELF_LOADER_TARGET -DNEW_PLUGIN_DESIGN_FIRST_REFINEMENT -DARM
 ifdef USE_MAD
 	DEFINES += -DUSE_MAD
 endif
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2
index 6d1a765456..0d6df8ae69 100644
--- a/backends/platform/ps2/Makefile.ps2
+++ b/backends/platform/ps2/Makefile.ps2
@@ -77,7 +77,7 @@ DEPDIR = .deps
 
 TARGET = elf/scummvm.elf
 
-DEFINES  += -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions -DNO_ADAPTOR
+DEFINES  += -DUSE_VORBIS -DUSE_TREMOR -DUSE_MAD -DUSE_ZLIB -DFORCE_RTL -DDISABLE_SAVEGAME_SORTING -D_EE -D__PLAYSTATION2__ -DELF_LOADER_TARGET -G2 -O2 -Wall -Wno-multichar -fno-rtti -fno-exceptions -DNO_ADAPTOR
 
 INCLUDES  = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
 INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile
index c479244551..010f6e635a 100644
--- a/backends/platform/psp/Makefile
+++ b/backends/platform/psp/Makefile
@@ -68,7 +68,7 @@ endif
 # Variables for common Scummvm makefile
 CXX      = psp-g++
 CXXFLAGS = -O3 -Wall -Wno-multichar -fno-exceptions -fno-rtti
-DEFINES  = -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB  -DDISABLE_DOSBOX_OPL -DUSE_RGB_COLOR
+DEFINES  = -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB  -DDISABLE_DOSBOX_OPL -DUSE_RGB_COLOR -DELF_LOADER_TARGET
 
 LDFLAGS  :=
 INCDIR   := $(srcdir) . $(srcdir)/engines/ $(PSPSDK)/include
diff --git a/backends/plugins/elf-loader.cpp b/backends/plugins/elf-loader.cpp
index 24532740b4..a3b453ed0f 100644
--- a/backends/plugins/elf-loader.cpp
+++ b/backends/plugins/elf-loader.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(DYNAMIC_MODULES) // TODO: && defined ELF loader target
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
 
 #include <string.h>
 #include <stdarg.h>
@@ -448,5 +448,5 @@ void *DLObject::symbol(const char *name) {
 	return NULL;
 }
 
-#endif /* DYNAMIC_MODULES */
+#endif /* defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) */
 
diff --git a/backends/plugins/elf-provider.cpp b/backends/plugins/elf-provider.cpp
index ae728495fa..76fa3cd6df 100644
--- a/backends/plugins/elf-provider.cpp
+++ b/backends/plugins/elf-provider.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(DYNAMIC_MODULES) //TODO: && defined(ELF loader target)
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
 
 #include "backends/plugins/elf-provider.h"
 #include "backends/plugins/dynamic-plugin.h"
@@ -133,4 +133,4 @@ bool ELFPluginProvider::isPluginFilename(const Common::FSNode &node) const {
 	return true;
 }
 
-#endif // defined(DYNAMIC_MODULES)
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
diff --git a/backends/plugins/elf-provider.h b/backends/plugins/elf-provider.h
index 10bd1c077f..a6b55d97f3 100644
--- a/backends/plugins/elf-provider.h
+++ b/backends/plugins/elf-provider.h
@@ -28,7 +28,7 @@
 
 #include "base/plugins.h"
 
-#if defined(DYNAMIC_MODULES) // TODO: && defined(ELF-loader target)
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
 
 class ELFPluginProvider : public FilePluginProvider {
 protected:
@@ -38,6 +38,6 @@ protected:
 
 };
 
-#endif // defined(DYNAMIC_MODULES)
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
 
 #endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */
-- 
cgit v1.2.3