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

toneman1138 at users.sourceforge.net toneman1138 at users.sourceforge.net
Fri Aug 13 04:58:53 CEST 2010


Revision: 52053
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52053&view=rev
Author:   toneman1138
Date:     2010-08-13 02:58:52 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
added appropriate ifdefs throughout the plugins directory

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h
    scummvm/branches/gsoc2010-plugins/backends/plugins/shorts-segment-manager.h

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/arm-loader.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ARM_TARGET)
+
 #include "backends/fs/ds/ds-fs.h"
 #include "elf-loader.h"
 #include "dsmain.h"
@@ -35,3 +37,5 @@
 public:
     ARMDLObject() : DLObject() {}
 };
+
+#endif /* defined(DYNAMIC_MODULES) && defined(ARM_TARGET) */

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ds/ds-provider.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,10 +23,12 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__DS__)
+
 #include "backends/plugins/elf-provider.h"
 
 class DSPluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
-
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-loader.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
 #ifndef ELF_LOADER_H
 #define ELF_LOADER_H
 
@@ -65,3 +67,5 @@
 };
 
 #endif /* ELF_LOADER_H */
+
+#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-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/elf-provider.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+
 #ifndef BACKENDS_PLUGINS_ELF_PROVIDER_H
 #define BACKENDS_PLUGINS_ELF_PROVIDER_H
 
@@ -32,8 +34,6 @@
 
 #include "backends/plugins/elf-loader.h"
 
-#if defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
-
 class ELFPlugin : public DynamicPlugin {
 protected:
 	DLObject *_dlHandle;
@@ -65,6 +65,6 @@
 
 };
 
+#endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */
+
 #endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
-
-#endif /* BACKENDS_PLUGINS_ELF_PROVIDER_H */

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/mips-loader.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -24,6 +24,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
+
 #include "elf-loader.h"
 #include "shorts-segment-manager.h"
 
@@ -44,3 +46,5 @@
 		_gpVal = 0;
     }
 };
+
+#endif /* defined(DYNAMIC_MODULES) && defined(MIPS_TARGET) */

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/ps2/ps2-provider.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,9 +23,13 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
+
 #include "backends/plugins/elf-provider.h"
 
 class PS2PluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
+#endif // defined(DYNAMIC_MODULES) && defined(ELF_LOADER_TARGET)
+

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/psp/psp-provider.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,17 +23,17 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(__PSP__)
+
 #ifndef BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
 #define BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H
 
 #include "backends/plugins/elf-provider.h"
 
-#if defined(DYNAMIC_MODULES) && defined(__PSP__)
-
 class PSPPluginProvider : public ELFPluginProvider {
 	Plugin* createPlugin(const Common::FSNode &node) const;
 };
 
+#endif /* BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H */
+
 #endif // defined(DYNAMIC_MODULES) && defined(__PSP__)
-
-#endif /* BACKENDS_PLUGINS_PSP_PSP_PROVIDER_H */

Modified: scummvm/branches/gsoc2010-plugins/backends/plugins/shorts-segment-manager.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/plugins/shorts-segment-manager.h	2010-08-12 23:55:12 UTC (rev 52052)
+++ scummvm/branches/gsoc2010-plugins/backends/plugins/shorts-segment-manager.h	2010-08-13 02:58:52 UTC (rev 52053)
@@ -23,6 +23,8 @@
  *
  */
 
+#if defined(DYNAMIC_MODULES) && defined(MIPS_TARGET)
+
 #ifndef SHORTS_SEGMENT_MANAGER_H
 #define SHORTS_SEGMENT_MANAGER_H
 
@@ -87,3 +89,5 @@
 };
 
 #endif /* SHORTS_SEGMENT_MANAGER_H */
+
+#endif /* defined(DYNAMIC_MODULES) && defined(MIPS_TARGET) */


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




More information about the Scummvm-git-logs mailing list