[Scummvm-cvs-logs] SF.net SVN: scummvm:[51716] scummvm/branches/gsoc2010-plugins/backends

[toneman1138 at users.sourceforge.net]

Revision: 51716
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51716&view=rev
Author:   toneman1138
Date:     2010-08-03 22:08:32 +0000 (Tue, 03 Aug 2010)

Log Message:
-----------
added checks for ELF_LOADER_TARGET before including the elf plugin provider

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
    scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ds/arm9/makefile	2010-08-03 22:08:32 UTC (rev 51716)
@@ -238,7 +238,7 @@
 
 
 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

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-08-03 22:08:32 UTC (rev 51716)
@@ -77,7 +77,7 @@
 
 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

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/psp/Makefile	2010-08-03 22:08:32 UTC (rev 51716)
@@ -68,7 +68,7 @@
 # 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

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.cpp	2010-08-03 22:08:32 UTC (rev 51716)
@@ -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 @@
 	return NULL;
 }
 
-#endif /* DYNAMIC_MODULES */
+#endif /* defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET) */
 

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.cpp	2010-08-03 22:08:32 UTC (rev 51716)
@@ -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 @@
 	return true;
 }
 
-#endif // defined(DYNAMIC_MODULES)
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h	2010-08-03 21:38:26 UTC (rev 51715)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h	2010-08-03 22:08:32 UTC (rev 51716)
@@ -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 @@
 
 };
 
-#endif // defined(DYNAMIC_MODULES)
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
 
 #endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.