[Scummvm-cvs-logs] SF.net SVN: scummvm: [28051] scummex/branches/gsoc2007-gameresbrowser/src
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Fri Jul 13 06:21:59 CEST 2007
Revision: 28051
http://scummvm.svn.sourceforge.net/scummvm/?rev=28051&view=rev
Author: zbychs
Date: 2007-07-12 21:21:58 -0700 (Thu, 12 Jul 2007)
Log Message:
-----------
Making it static under Linux.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Test2.cpp
scummex/branches/gsoc2007-gameresbrowser/src/browserapp/browserapp_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/core/core_static_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/basic_plugin.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Test2.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Test2.cpp 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/Test2.cpp 2007-07-13 04:21:58 UTC (rev 28051)
@@ -28,21 +28,22 @@
#include "VirtualNode.h"
#include "Directories.h"
-//#include "DirectoryPresenter.h"
-//#include "BasicParsers.h"
-//#include "ImagePresenter.h"
-//#include "FileInfoPresenter.h"
+#include "FileTypeRecognizer.h"
#include "PanelProvider.h"
-#include "FileTypeRecognizer.h"
-//#include "TextPresenter.h"
-//#include "HtmlPresenter.h"
-//#include "scumm/ScummRecognizer.h"
-//#include "scumm/ScummParser.h"
-//#include "scumm/ScummBlockPresenter.h"
-//#include "scumm/ScummBlockInfoPresenter.h"
-//#include "scumm/BlockyBlockPresenter.h"
+#include "basic/DirectoryPresenter.h"
+#include "basic/BasicParsers.h"
+#include "basic/ImagePresenter.h"
+#include "basic/FileInfoPresenter.h"
+#include "basic/TextPresenter.h"
+#include "basic/HtmlPresenter.h"
+#include "scumm/ScummRecognizer.h"
+#include "scumm/ScummParser.h"
+#include "scumm/ScummBlockPresenter.h"
+#include "scumm/ScummBlockInfoPresenter.h"
+#include "scumm/BlockyBlockPresenter.h"
+
#include "debugmem.h"
using namespace Browser;
@@ -53,17 +54,18 @@
#define EMPTY_TOKEN
PLUGIN_DESC_EX(Test2Plugin, wxT("MyPlugins"), 1, EMPTY_TOKEN)
//PLUGGED_OBJECT(RootDirectory)
- //PLUGGED_OBJECT(DirectoryPresenter)
- //PLUGGED_OBJECT(ImagePresenter)
- //PLUGGED_OBJECT(TextPresenter)
- //PLUGGED_OBJECT(HtmlPresenter)
- //PLUGGED_OBJECT(FileInfoPresenter)
PLUGGED_OBJECT(PanelProvider)
- //PLUGGED_OBJECT(TextParser)
- //PLUGGED_OBJECT(BinaryParser)
- //PLUGGED_OBJECT(BMPParser)
+ PLUGGED_OBJECT(DirectoryPresenter)
+ PLUGGED_OBJECT(ImagePresenter)
+ PLUGGED_OBJECT(TextPresenter)
+ PLUGGED_OBJECT(HtmlPresenter)
+ PLUGGED_OBJECT(FileInfoPresenter)
+ PLUGGED_OBJECT(TextParser)
+ PLUGGED_OBJECT(BinaryParser)
+ PLUGGED_OBJECT(BMPParser)
+
PLUGGED_OBJECT(BinaryFileTypeRecognizer)
PLUGGED_OBJECT(BinaryFileTypeParserResolver)
PLUGGED_OBJECT(BMPFileTypeRecognizer)
@@ -71,22 +73,22 @@
PLUGGED_OBJECT(TextFileTypeRecognizer)
PLUGGED_OBJECT(TextFileTypeParserResolver)
- //PLUGGED_OBJECT(ScummFileTypeRecognizer)
- //PLUGGED_OBJECT(ScummFileTypeParserResolver)
+ PLUGGED_OBJECT(ScummFileTypeRecognizer)
+ PLUGGED_OBJECT(ScummFileTypeParserResolver)
- //PLUGGED_OBJECT(ScummParser)
- //PLUGGED_OBJECT(ScummBlockPresenter)
- //PLUGGED_OBJECT(ScummBlockInfoPresenter)
- //PLUGGED_OBJECT(BlockyBlockPresenter)
+ PLUGGED_OBJECT(ScummParser)
+ PLUGGED_OBJECT(ScummBlockPresenter)
+ PLUGGED_OBJECT(ScummBlockInfoPresenter)
+ PLUGGED_OBJECT(BlockyBlockPresenter)
- //PLUGGED_OBJECT(ScummLOFFBlockPresenter)
- //PLUGGED_OBJECT(ScummOFFSBlockPresenter)
- //PLUGGED_OBJECT(ScummRMHDBlockPresenter)
- //PLUGGED_OBJECT(ScummTRNSBlockPresenter)
- //PLUGGED_OBJECT(ScummPALBlockPresenter)
- //PLUGGED_OBJECT(ScummIMGBlockPresenter)
+ PLUGGED_OBJECT(ScummLOFFBlockPresenter)
+ PLUGGED_OBJECT(ScummOFFSBlockPresenter)
+ PLUGGED_OBJECT(ScummRMHDBlockPresenter)
+ PLUGGED_OBJECT(ScummTRNSBlockPresenter)
+ PLUGGED_OBJECT(ScummPALBlockPresenter)
+ PLUGGED_OBJECT(ScummIMGBlockPresenter)
- //PLUGGED_OBJECT(ScummScriptBlockPresenter)
+ PLUGGED_OBJECT(ScummScriptBlockPresenter)
PLUGIN_END
@@ -101,9 +103,9 @@
#define DLL_IMPORT
#endif
-extern "C" {
-DLL_IMPORT const Plugin& getPlugin();
-}
+//extern "C" {
+//DLL_IMPORT const Plugin& getPlugin();
+//}
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@ -114,7 +116,7 @@
infoout << wxT("Registering Test2 Plugin.") << std::endl;
ObjectRegistry::get()->registerPlugin( &getTest2Plugin, false );
- ObjectRegistry::get()->registerPlugin( &getPlugin, false );
+ //ObjectRegistry::get()->registerPlugin( &getPlugin, false );
FileTypeRegistry::get()->registerPlugins();
wxTreeItemId rootItem = ExplorationTree::get()->addRoot(wxT("RootDirectory"));
@@ -173,7 +175,7 @@
infoout << wxT("Registering Test2 Plugin.") << std::endl;
ObjectRegistry::get()->registerPlugin( &getTest2Plugin, false );
- ObjectRegistry::get()->registerPlugin( &getPlugin, false );
+ //ObjectRegistry::get()->registerPlugin( &getPlugin, false );
FileTypeRegistry::get()->registerPlugins();
wxTreeItemId rootItem = ExplorationTree::get()->addRoot(wxT("RootDirectory"));
Modified: scummex/branches/gsoc2007-gameresbrowser/src/browserapp/browserapp_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/browserapp/browserapp_stdafx.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/browserapp/browserapp_stdafx.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -7,6 +7,8 @@
#define _BROWSERAPP_STDAFX_H_
#include "browser_stdafx.h"
+#include "basic/basic_stdafx.h"
+#include "scumm/scumm_stdafx.h"
/*
When getting error like this:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/core_static_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core_static_stdafx.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core_static_stdafx.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -6,9 +6,11 @@
#ifndef _CORE_STATIC_STDAFX_H_
#define _CORE_STATIC_STDAFX_H_
+#ifdef _MSC_VER
#ifndef WXUSINGDLL
- #error WXUSINGDLL must be defined
+ #error WXUSINGDLL must be defined for a DLL build
#endif
+#endif
#include <wx/string.h>
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/basic_plugin.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/basic_plugin.cpp 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/basic_plugin.cpp 2007-07-13 04:21:58 UTC (rev 28051)
@@ -28,9 +28,9 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-
+/*
PLUGIN_DESC_RAW(BasicPlugin, wxT("MyPlugins"), 1)
- /*
+ /
PLUGGED_OBJECT(PanelProvider)
PLUGGED_OBJECT(BinaryFileTypeRecognizer)
PLUGGED_OBJECT(BinaryFileTypeParserResolver)
@@ -38,7 +38,7 @@
PLUGGED_OBJECT(BMPFileTypeParserResolver)
PLUGGED_OBJECT(TextFileTypeRecognizer)
PLUGGED_OBJECT(TextFileTypeParserResolver)
- */
+ /
PLUGGED_OBJECT(DirectoryPresenter)
PLUGGED_OBJECT(ImagePresenter)
@@ -68,7 +68,7 @@
//PLUGGED_OBJECT(ScummScriptBlockPresenter)
PLUGIN_END
-
+*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -22,7 +22,7 @@
class IBlocksDirectoryImpl;
-class BlockyBlockPresenter : public BObject {
+class SCUMM_PLUGIN_API BlockyBlockPresenter : public BObject {
DECLARE_BOBJECT_CLASS(BlockyBlockPresenter, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -25,7 +25,7 @@
// ScummBlockPresenterBase is a convenience class that makes writing other
// presenters easier. In the create() method it retrieves the ScummBlock
// from the _blockSlot, gets it's stream and invokes inCreate()
-class ScummBlockPresenterBase : public BObject {
+class SCUMM_PLUGIN_API ScummBlockPresenterBase : public BObject {
DECLARE_BOBJECT_CLASS(ScummBlockPresenterBase, BObject)
protected:
@@ -55,7 +55,7 @@
// inCreate() method, so that all the subclasses need to do is to override
// doCreate() method and set the _title, _text and _monospace fields as they
// choose.
-class ScummBlockInfoPresenterBase : public ScummBlockPresenterBase {
+class SCUMM_PLUGIN_API ScummBlockInfoPresenterBase : public ScummBlockPresenterBase {
DECLARE_BOBJECT_CLASS(ScummBlockInfoPresenterBase, ScummBlockPresenterBase)
protected:
@@ -85,7 +85,7 @@
// the data as an image. It does all the setup job in the inCreate() method,
// so that all the subclasses need to do is to override doCreate() method and
// set the _title and _image fields as they choose.
-class ScummBlockImagePresenter : public ScummBlockPresenterBase {
+class SCUMM_PLUGIN_API ScummBlockImagePresenter : public ScummBlockPresenterBase {
DECLARE_BOBJECT_CLASS(ScummBlockImagePresenter, ScummBlockPresenterBase)
protected:
@@ -111,7 +111,7 @@
// (it's in ScummResource.cpp) and exposes it as an IUrl pin, so that HTMLPresenter
// can pick it up and display it.
-class ScummBlockInfoPresenter : public ScummBlockInfoPresenterBase {
+class SCUMM_PLUGIN_API ScummBlockInfoPresenter : public ScummBlockInfoPresenterBase {
DECLARE_BOBJECT_CLASS(ScummBlockInfoPresenter, ScummBlockInfoPresenterBase)
protected:
@@ -142,7 +142,7 @@
// ScummEntryBlockPresenter is a base class for all the block presenters that
// need to display some "entries" from the chunk (like offsets in LOFF chunk).
-class ScummEntryBlockPresenter : public ScummBlockInfoPresenterBase {
+class SCUMM_PLUGIN_API ScummEntryBlockPresenter : public ScummBlockInfoPresenterBase {
DECLARE_BOBJECT_CLASS(ScummEntryBlockPresenter, ScummBlockInfoPresenterBase)
protected:
@@ -175,7 +175,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummLOFFBlockPresenter : public ScummEntryBlockPresenter {
+class SCUMM_PLUGIN_API ScummLOFFBlockPresenter : public ScummEntryBlockPresenter {
DECLARE_BOBJECT_CLASS(ScummLOFFBlockPresenter, ScummEntryBlockPresenter)
public:
@@ -188,7 +188,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummOFFSBlockPresenter : public ScummEntryBlockPresenter {
+class SCUMM_PLUGIN_API ScummOFFSBlockPresenter : public ScummEntryBlockPresenter {
DECLARE_BOBJECT_CLASS(ScummOFFSBlockPresenter, ScummEntryBlockPresenter)
public:
@@ -204,7 +204,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummRMHDBlockPresenter : public ScummBlockInfoPresenterBase {
+class SCUMM_PLUGIN_API ScummRMHDBlockPresenter : public ScummBlockInfoPresenterBase {
DECLARE_BOBJECT_CLASS(ScummRMHDBlockPresenter, ScummBlockInfoPresenterBase)
public:
@@ -216,7 +216,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummTRNSBlockPresenter : public ScummBlockInfoPresenterBase {
+class SCUMM_PLUGIN_API ScummTRNSBlockPresenter : public ScummBlockInfoPresenterBase {
DECLARE_BOBJECT_CLASS(ScummTRNSBlockPresenter, ScummBlockInfoPresenterBase)
public:
@@ -228,7 +228,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummScriptBlockPresenter : public ScummBlockInfoPresenterBase {
+class SCUMM_PLUGIN_API ScummScriptBlockPresenter : public ScummBlockInfoPresenterBase {
DECLARE_BOBJECT_CLASS(ScummScriptBlockPresenter, ScummBlockInfoPresenterBase)
public:
@@ -240,7 +240,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummPALBlockPresenter : public ScummBlockImagePresenter {
+class SCUMM_PLUGIN_API ScummPALBlockPresenter : public ScummBlockImagePresenter {
DECLARE_BOBJECT_CLASS(ScummPALBlockPresenter, ScummBlockImagePresenter)
public:
@@ -252,7 +252,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummIMGBlockPresenter : public ScummBlockImagePresenter {
+class SCUMM_PLUGIN_API ScummIMGBlockPresenter : public ScummBlockImagePresenter {
DECLARE_BOBJECT_CLASS(ScummIMGBlockPresenter, ScummBlockImagePresenter)
public:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -58,7 +58,7 @@
//
// ScummParser is it's subclass.
-class ScummBlockPresenter : public BObject {
+class SCUMM_PLUGIN_API ScummBlockPresenter : public BObject {
DECLARE_BOBJECT_CLASS(ScummBlockPresenter, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -24,7 +24,7 @@
//
// See comment for ScummBlockPresenter (ScummParser derives from it).
-class ScummParser : public ScummBlockPresenter {
+class SCUMM_PLUGIN_API ScummParser : public ScummBlockPresenter {
DECLARE_BOBJECT_CLASS(ScummParser, ScummBlockPresenter)
public:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h 2007-07-13 04:21:58 UTC (rev 28051)
@@ -19,7 +19,7 @@
struct ScummTag;
}
-class ScummFileTypeRecognizer : public GenericFileTypeRecognizer {
+class SCUMM_PLUGIN_API ScummFileTypeRecognizer : public GenericFileTypeRecognizer {
DECLARE_BOBJECT_CLASS(ScummFileTypeRecognizer, BObject)
public:
@@ -33,7 +33,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class ScummFileTypeParserResolver : public BObject, public FileTypeParserResolver {
+class SCUMM_PLUGIN_API ScummFileTypeParserResolver : public BObject, public FileTypeParserResolver {
DECLARE_BOBJECT_CLASS(ScummFileTypeParserResolver, BObject)
public:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp 2007-07-13 04:03:42 UTC (rev 28050)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp 2007-07-13 04:21:58 UTC (rev 28051)
@@ -30,9 +30,9 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-
+/*
PLUGIN_DESC_RAW(ScummPlugin, wxT("MyPlugins"), 1)
- /*
+ /
PLUGGED_OBJECT(PanelProvider)
PLUGGED_OBJECT(BinaryFileTypeRecognizer)
PLUGGED_OBJECT(BinaryFileTypeParserResolver)
@@ -40,7 +40,7 @@
PLUGGED_OBJECT(BMPFileTypeParserResolver)
PLUGGED_OBJECT(TextFileTypeRecognizer)
PLUGGED_OBJECT(TextFileTypeParserResolver)
- */
+ /
PLUGGED_OBJECT(DirectoryPresenter)
PLUGGED_OBJECT(ImagePresenter)
@@ -70,7 +70,7 @@
PLUGGED_OBJECT(ScummScriptBlockPresenter)
PLUGIN_END
-
+*/
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
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