[Scummvm-cvs-logs] SF.net SVN: scummvm: [28040] scummex/branches/gsoc2007-gameresbrowser/src/ plugins
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Thu Jul 12 08:06:09 CEST 2007
Revision: 28040
http://scummvm.svn.sourceforge.net/scummvm/?rev=28040&view=rev
Author: zbychs
Date: 2007-07-11 23:06:08 -0700 (Wed, 11 Jul 2007)
Log Message:
-----------
Added Scumm plugin.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/BMPParser.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/DirectoryPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/FileInfoPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/HtmlPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/TextPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImage.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImageDetail.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm6.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scummutil.h
Added Paths:
-----------
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ReadMe.txt
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.cpp
scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.h
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/BMPParser.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/BMPParser.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/BMPParser.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class TextParser : public BObject {
+class BASIC_PLUGIN_API TextParser : public BObject {
DECLARE_BOBJECT_CLASS(TextParser, BObject)
protected:
@@ -36,7 +36,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class BinaryParser : public BObject {
+class BASIC_PLUGIN_API BinaryParser : public BObject {
DECLARE_BOBJECT_CLASS(BinaryParser, BObject)
protected:
@@ -55,7 +55,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class BMPParser : public BObject {
+class BASIC_PLUGIN_API BMPParser : public BObject {
DECLARE_BOBJECT_CLASS(BMPParser, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/DirectoryPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/DirectoryPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/DirectoryPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -22,7 +22,7 @@
class INodeProvider;
-class DirectoryPresenter : public BObject, public DirectoryController {
+class BASIC_PLUGIN_API DirectoryPresenter : public BObject, public DirectoryController {
DECLARE_BOBJECT_CLASS(DirectoryPresenter, BObject)
protected:
@@ -31,7 +31,14 @@
IDirectory* _idirectory;
INodeProvider* _inodeprovider;
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4251)
+#endif
std::list<VirtualNodeItemData*> _kidChains;
+#ifdef _MSC_VER
+#pragma warning(default : 4251)
+#endif
bool _expanded;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/FileInfoPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/FileInfoPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/FileInfoPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -18,7 +18,7 @@
class FileInfoPresenter;
-class DumpFileEvtHandler : public wxEvtHandler {
+class BASIC_PLUGIN_API DumpFileEvtHandler : public wxEvtHandler {
friend class FileInfoPresenter;
FileInfoPresenter* _that;
DumpFileEvtHandler(FileInfoPresenter* that)
@@ -26,7 +26,7 @@
void dumpButtonClick(wxCommandEvent& event);
};
-class FileInfoPresenter : public BObject, public PanelReciever {
+class BASIC_PLUGIN_API FileInfoPresenter : public BObject, public PanelReciever {
DECLARE_BOBJECT_CLASS(FileInfoPresenter, BObject)
friend class DumpFileEvtHandler;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/HtmlPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/HtmlPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/HtmlPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class HtmlPresenter : public BObject, public PanelReciever {
+class BASIC_PLUGIN_API HtmlPresenter : public BObject, public PanelReciever {
DECLARE_BOBJECT_CLASS(HtmlPresenter, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/ImagePresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -18,14 +18,14 @@
class ImagePresenter;
-struct DumpImageEvtHandler : public wxEvtHandler {
+struct BASIC_PLUGIN_API DumpImageEvtHandler : public wxEvtHandler {
ImagePresenter* _that;
DumpImageEvtHandler(ImagePresenter* that)
: _that(that) {}
void dumpButtonClick(wxCommandEvent& event);
};
-class ImagePresenter : public BObject, public PanelReciever {
+class BASIC_PLUGIN_API ImagePresenter : public BObject, public PanelReciever {
DECLARE_BOBJECT_CLASS(ImagePresenter, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/TextPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/TextPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/basic/TextPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-class TextPresenter : public BObject, public PanelReciever {
+class BASIC_PLUGIN_API TextPresenter : public BObject, public PanelReciever {
DECLARE_BOBJECT_CLASS(TextPresenter, BObject)
protected:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// BlockyBlockPresenter.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/BlockyBlockPresenter.h"
#include "scumm/resource.h"
@@ -13,6 +13,8 @@
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
@@ -71,7 +73,7 @@
}
}
-const ifile_list& IVirtualBlocksDirectoryImpl::getFiles() {
+const ifile_list_t& IVirtualBlocksDirectoryImpl::getFiles() {
//infoout << wxT("IVirtualBlocksDirectoryImpl::getFiles()") << std::endl;
create();
return _ifiles;
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/BlockyBlockPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -11,6 +11,8 @@
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
@@ -89,7 +91,7 @@
IVirtualBlocksDirectoryImpl(IDirectory* parentDir, coreString name, const block_list& blocks, bool ownBlocks);
virtual ~IVirtualBlocksDirectoryImpl();
- virtual const ifile_list& getFiles();
+ virtual const ifile_list_t& getFiles();
void addBlock(coreString name, ScummBlock* block);
Added: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ReadMe.txt
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ReadMe.txt (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ReadMe.txt 2007-07-12 06:06:08 UTC (rev 28040)
@@ -0,0 +1,33 @@
+========================================================================
+ DYNAMIC LINK LIBRARY : scumm_plugin Project Overview
+========================================================================
+
+AppWizard has created this scumm_plugin DLL for you.
+
+This file contains a summary of what you will find in each of the files that
+make up your scumm_plugin application.
+
+
+scumm_plugin.vcproj
+ This is the main project file for VC++ projects generated using an Application Wizard.
+ It contains information about the version of Visual C++ that generated the file, and
+ information about the platforms, configurations, and project features selected with the
+ Application Wizard.
+
+scumm_plugin.cpp
+ This is the main DLL source file.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+ These files are used to build a precompiled header (PCH) file
+ named scumm_plugin.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////
Property changes on: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ReadMe.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,23 +1,23 @@
/////////////////////////////////////////////////////////////////////////////
// ScummBlockPresenter.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/ScummBlockInfoPresenter.h"
#include "scumm/ScummBlockPresenter.h"
#include "scumm/descumm.h"
#include "CoreInterfaces.h"
+#include "PluginUtil.h"
#include <iostream>
-wxFrame* getMainForm();
-wxString getResourcePath(const wxString& resourceName);
-
#include "debugmem.h"
namespace Browser {
+using namespace Core;
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@ -136,7 +136,7 @@
_text << wxT("Description: ") << binfo->description << wxEndl();
_text << wxT("Help: ") << binfo->htmlfile << wxEndl();
_text << wxT("Icon: ") << binfo->iconid << wxEndl();
- _url = getResourcePath(toString(binfo->htmlfile));
+ _url = PluginUtil::getResourcePath(toString(binfo->htmlfile));
} else {
_text << wxT("Could not find block info.") << wxEndl();
_url = wxT("");
@@ -299,7 +299,7 @@
wxT("The Curse of Monkey Island")
};
- wxSingleChoiceDialog *dialog = new wxSingleChoiceDialog(getMainForm(), wxT("Please select the correct game"), wxT("Scumm version selection"), 22, games, NULL, wxOK|wxCANCEL|wxCENTRE, wxDefaultPosition);
+ wxSingleChoiceDialog *dialog = new wxSingleChoiceDialog(PluginUtil::getMainForm(), wxT("Please select the correct game"), wxT("Scumm version selection"), 22, games, NULL, wxOK|wxCANCEL|wxCENTRE, wxDefaultPosition);
int ret = 0;
if (dialog->ShowModal() == wxID_OK) {
choice = dialog->GetSelection();
@@ -412,6 +412,8 @@
namespace Browser {
+using namespace Core;
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockInfoPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -7,11 +7,14 @@
//#include "scumm/ScummBlockPresenter.h"
#include "CoreInterfaces.h"
#include "GUIInterfaces.h"
+#include "basic/AuxInterfaces.h"
#include "scumm/resource.h"
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ScummBlockPresenter.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/ScummBlockPresenter.h"
#include "scumm/BlockyBlockPresenter.h"
@@ -15,6 +15,8 @@
namespace Browser {
+using namespace Core;
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummBlockPresenter.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -10,6 +10,8 @@
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ScummFileTypes.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "ScummFileTypes.h"
@@ -9,28 +9,30 @@
namespace Browser {
+using namespace Core;
+
namespace Scumm {
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// ScummFileTypes
-SAFE_STATIC(newScummFileType, BGUID, (wxT("ScummFileTypes"), wxT("New Scumm File"), 1) )
-SAFE_STATIC(oldScummFileType, BGUID, (wxT("ScummFileTypes"), wxT("Old Scumm File"), 1) )
+SAFE_LOCAL_STATIC(newScummFileType, BGUID, (wxT("ScummFileTypes"), wxT("New Scumm File"), 1) )
+SAFE_LOCAL_STATIC(oldScummFileType, BGUID, (wxT("ScummFileTypes"), wxT("Old Scumm File"), 1) )
-SAFE_STATIC(scummParserGUID, BGUID, (wxT("ScummObjects"), wxT("ScummParser"), 1) )
-SAFE_STATIC(scummBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummBlockPresenter"), 1) )
-SAFE_STATIC(scummBlockInfoPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummBlockInfoPresenter"), 1) )
-SAFE_STATIC(blockyBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("BlockyBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummParserGUID, BGUID, (wxT("ScummObjects"), wxT("ScummParser"), 1) )
+SAFE_LOCAL_STATIC(scummBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummBlockInfoPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummBlockInfoPresenter"), 1) )
+SAFE_LOCAL_STATIC(blockyBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("BlockyBlockPresenter"), 1) )
-SAFE_STATIC(scummLOFFBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummLOFFBlockPresenter"), 1) )
-SAFE_STATIC(scummOFFSBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummOFFSBlockPresenter"), 1) )
-SAFE_STATIC(scummRMHDBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummRMHDBlockPresenter"), 1) )
-SAFE_STATIC(scummTRNSBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummTRNSBlockPresenter"), 1) )
-SAFE_STATIC(scummPALBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummPALBlockPresenter"), 1) )
-SAFE_STATIC(scummIMGBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummIMGBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummLOFFBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummLOFFBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummOFFSBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummOFFSBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummRMHDBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummRMHDBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummTRNSBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummTRNSBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummPALBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummPALBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummIMGBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummIMGBlockPresenter"), 1) )
-SAFE_STATIC(scummScriptBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummScriptBlockPresenter"), 1) )
+SAFE_LOCAL_STATIC(scummScriptBlockPresenterGUID, BGUID, (wxT("ScummObjects"), wxT("ScummScriptBlockPresenter"), 1) )
//SAFE_STATIC(rootDirectoryFileType, RecognizedFileType,
// (PERFECT_MATCH, BGUID(wxT("CoreFileTypes"), wxT("Root Directory"), 1)) )
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummFileTypes.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -11,28 +11,30 @@
namespace Browser {
+using namespace Core;
+
namespace Scumm {
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// ScummFileTypes
-SAFE_STATIC_DECL(newScummFileType, BGUID)
-SAFE_STATIC_DECL(oldScummFileType, BGUID)
+SAFE_LOCAL_STATIC_DECL(newScummFileType, BGUID)
+SAFE_LOCAL_STATIC_DECL(oldScummFileType, BGUID)
-SAFE_STATIC_DECL(scummParserGUID, BGUID)
-SAFE_STATIC_DECL(scummBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummBlockInfoPresenterGUID, BGUID)
-SAFE_STATIC_DECL(blockyBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummParserGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummBlockInfoPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(blockyBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummLOFFBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummOFFSBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummRMHDBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummTRNSBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummPALBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummIMGBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummLOFFBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummOFFSBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummRMHDBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummTRNSBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummPALBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummIMGBlockPresenterGUID, BGUID)
-SAFE_STATIC_DECL(scummScriptBlockPresenterGUID, BGUID)
+SAFE_LOCAL_STATIC_DECL(scummScriptBlockPresenterGUID, BGUID)
//SAFE_STATIC_DECL(rootDirectoryFileType, RecognizedFileType)
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImage.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImage.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImage.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ScummBlockPresenter.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/ScummBlockInfoPresenter.h"
#include "scumm/ScummBlockPresenter.h"
@@ -14,6 +14,8 @@
namespace Browser {
+using namespace Core;
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImageDetail.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImageDetail.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummImageDetail.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -21,7 +21,7 @@
*
*/
-#include "common/common_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/codec37.h"
#include "scumm/codec47.h"
#include "scumm/bomp.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
// ScummParser.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/ScummParser.h"
@@ -11,12 +11,14 @@
#include <iostream>
#include <wx/image.h>
-#include "wx2scstream.h"
+#include "streams/wx2scstream.h"
#include "debugmem.h"
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -12,6 +12,8 @@
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -1,14 +1,14 @@
/////////////////////////////////////////////////////////////////////////////
// ScummRecognizer.cpp
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "scumm/ScummRecognizer.h"
#include "scumm/scummutil.h"
#include "scumm/resource.h"
#include "scumm/ScummFileTypes.h"
-#include "common/xorstream.h"
+#include "streams/xorstream.h"
#include "CoreFileTypes.h"
@@ -16,6 +16,8 @@
namespace Browser {
+using namespace Core;
+
using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
@@ -101,22 +103,22 @@
if (fileType == newScummFileType() ||
fileType == oldScummFileType()) {
- guid_list parsers;
- parsers.push_back(scummParserGUID());
+ guid_list_t parsers;
+ parsers.push_back(&const_cast<BGUID&>(scummParserGUID()));
//parsers.push_back(scummBlockPresenterGUID());
//parsers.push_back(scummBlockInfoPresenterGUID());
- parsers.push_back(blockyBlockPresenterGUID());
- parsers.push_back(CoreFileTypes::fileInfoPresenterGUID());
+ parsers.push_back(&const_cast<BGUID&>(blockyBlockPresenterGUID()));
+ parsers.push_back(&const_cast<BGUID&>(CoreFileTypes::fileInfoPresenterGUID()));
return ResolvedFileTypeParsers(IDEAL_PARSERS, parsers);
}
if (fileType.facility == wxT("NewScummBlock") ||
fileType.facility == wxT("OldScummBlock")) {
- guid_list parsers;
+ guid_list_t parsers;
parsers = ScummBlockFactory::getScummBlockParsers(fileType);
- parsers.push_front(scummBlockPresenterGUID());
- parsers.push_back(scummBlockInfoPresenterGUID());
- parsers.push_back(CoreFileTypes::fileInfoPresenterGUID());
+ parsers.push_front(&const_cast<BGUID&>(scummBlockPresenterGUID()));
+ parsers.push_back(&const_cast<BGUID&>(scummBlockInfoPresenterGUID()));
+ parsers.push_back(&const_cast<BGUID&>(CoreFileTypes::fileInfoPresenterGUID()));
return ResolvedFileTypeParsers(IDEAL_PARSERS, parsers);
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummRecognizer.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -8,6 +8,8 @@
namespace Browser {
+using namespace Core;
+
//using namespace Scumm;
/////////////////////////////////////////////////////////////////////////////
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -20,8 +20,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/bomp.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/bomp.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -23,7 +23,7 @@
#ifndef BOMP_H
#define BOMP_H
-#include "common/scummsys.h"
+#include "streams/scummsys.h"
int32 setupBompScale(byte *scaling, int32 size, byte scale);
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -20,8 +20,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/bomp.h"
#include "scumm/codec37.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec37.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -23,7 +23,7 @@
#ifndef SMUSH_CODEC37_H
#define SMUSH_CODEC37_H
-#include "common/scummsys.h"
+#include "streams/scummsys.h"
class Codec37Decoder {
private:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -20,8 +20,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/bomp.h"
#include "scumm/codec47.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/codec47.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -23,7 +23,7 @@
#ifndef SMUSH_CODEC_47_H
#define SMUSH_CODEC_47_H
-#include "common/scummsys.h"
+#include "streams/scummsys.h"
class Codec47Decoder {
private:
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -21,8 +21,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/descumm.h"
@@ -3146,7 +3146,7 @@
}
}
//g_descumm_viewer->AppendText(buffer);
- outText += Browser::toString(buffer);
+ outText += Core::toString(buffer);
}
free(buffer);
}
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -24,9 +24,9 @@
#ifndef DESCUMM_H
#define DESCUMM_H
-#include "common/common_stdafx.h"
-#include "common/scummsys.h"
-#include "common/stream.h"
+#include "streams/streams_stdafx.h"
+#include "streams/scummsys.h"
+#include "streams/stream.h"
#include <assert.h>
#include <ctype.h>
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm6.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm6.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/descumm6.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -21,8 +21,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/descumm.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -28,7 +28,7 @@
// This file is taken from original ScummEx, and modified
//
-#include "plugins_stdafx.h"
+#include "scumm_stdafx.h"
#include "guid.h"
@@ -45,6 +45,8 @@
namespace Browser {
+using namespace Core;
+
namespace Scumm {
/////////////////////////////////////////////////////////////////////////////
@@ -715,7 +717,7 @@
struct sbCreator {
ScummTag* _tag;
- guid_list _parsers;
+ guid_list_t _parsers;
ScummChunkSizeMode _sizeMode;
@@ -736,7 +738,7 @@
virtual ScummBlock* create(ScummTag* tag, uint32 size, Common::SeekableReadStream* stream) = 0;
int addParser(const BGUID& parserGUID) {
- _parsers.push_back(parserGUID);
+ _parsers.push_back(&const_cast<BGUID&>(parserGUID));
return 1;
}
};
@@ -968,7 +970,7 @@
return block;
}
-/*static*/ guid_list ScummBlockFactory::getScummBlockParsers(const BGUID& tagGUID) {
+/*static*/ guid_list_t ScummBlockFactory::getScummBlockParsers(const BGUID& tagGUID) {
wxString tagName = tagGUID.identifier;
sbCreator* creator = ScummBlockFactory::getCreatorForTag(tagName);
@@ -1011,7 +1013,7 @@
const byte encBytesTable[] = {
0x00, 0x69, 0xFF
};
-const int encBytesTableSize = ARRAY_SIZE(encBytesTable);
+const int encBytesTableSize = 3;
const struct blockInfo blocksInfo[] = {
{"RNAM", wxT("Room Names"), 1, wxT("help/specRNAM.html"), 47},
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -31,7 +31,7 @@
#ifndef _SCUMM_RESOURCE_H_
#define _SCUMM_RESOURCE_H_
-#include "common/stream.h"
+#include "streams/stream.h"
#include "FileType.h"
#include "FileTypeRecognizer.h"
@@ -40,6 +40,8 @@
namespace Browser {
+using namespace Core;
+
namespace Scumm {
/////////////////////////////////////////////////////////////////////////////
@@ -148,7 +150,7 @@
public:
static sbCreator* getCreatorForTag(wxString tagName);
static ScummBlock* create(ScummTag* tag, uint32 size, Common::SeekableReadStream* stream);
- static guid_list getScummBlockParsers(const BGUID& tagGUID);
+ static guid_list_t getScummBlockParsers(const BGUID& tagGUID);
};
enum ScummChunkSizeMode {
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.cpp 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -21,8 +21,8 @@
*
*/
-#include "plugins_stdafx.h"
-#include "common/common_stdafx.h"
+#include "scumm_stdafx.h"
+#include "streams/streams_stdafx.h"
#include "scumm/scaler.h"
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scaler.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -24,7 +24,7 @@
#ifndef SCALER_H
#define SCALER_H
-#include "common/scummsys.h"
+#include "streams/scummsys.h"
void scale(int scale, const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
void AdvMame2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
Added: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -0,0 +1,107 @@
+// basic_plugin.cpp : Defines the entry point for the DLL application.
+//
+
+#include "scumm_stdafx.h"
+
+#include "plugin.h"
+
+//#include "Directories.h"
+//#include "PanelProvider.h"
+//#include "FileTypeRecognizer.h"
+
+#include "basic/DirectoryPresenter.h"
+#include "basic/BMPParser.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;
+
+using namespace Scumm;
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+PLUGIN_DESC(ScummPlugin, wxT("MyPlugins"), 1)
+ /*
+ PLUGGED_OBJECT(PanelProvider)
+ PLUGGED_OBJECT(BinaryFileTypeRecognizer)
+ PLUGGED_OBJECT(BinaryFileTypeParserResolver)
+ PLUGGED_OBJECT(BMPFileTypeRecognizer)
+ PLUGGED_OBJECT(BMPFileTypeParserResolver)
+ PLUGGED_OBJECT(TextFileTypeRecognizer)
+ PLUGGED_OBJECT(TextFileTypeParserResolver)
+ */
+
+ 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(ScummFileTypeRecognizer)
+ PLUGGED_OBJECT(ScummFileTypeParserResolver)
+
+ 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(ScummScriptBlockPresenter)
+PLUGIN_END
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+//#ifdef _MANAGED
+//#pragma managed(push, off)
+//#endif
+
+#ifdef _MSC_VER
+
+BOOL APIENTRY DllMain( HMODULE hModule,
+ DWORD ul_reason_for_call,
+ LPVOID lpReserved
+ )
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
+}
+
+#endif //_MSC_VER
+
+//#ifdef _MANAGED
+//#pragma managed(pop)
+//#endif
+
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
Property changes on: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.h (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -0,0 +1,16 @@
+// The following ifdef block is the standard way of creating macros which make exporting
+// from a DLL simpler. All files within this DLL are compiled with the BASIC_PLUGIN_EXPORTS
+// symbol defined on the command line. this symbol should not be defined on any project
+// that uses this DLL. This way any other project whose source files include this file see
+// BASIC_PLUGIN_API functions as being imported from a DLL, whereas this DLL sees symbols
+// defined with this macro as being exported.
+
+#ifdef _MSC_VER
+#ifdef SCUMM_PLUGIN_EXPORTS
+ #define SCUMM_PLUGIN_API __declspec(dllexport)
+#else
+ #define SCUMM_PLUGIN_API __declspec(dllimport)
+#endif
+#else
+ #define SCUMM_PLUGIN_API
+#endif
Property changes on: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_plugin.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.cpp (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.cpp 2007-07-12 06:06:08 UTC (rev 28040)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// basic_plugin.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "scumm_stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Property changes on: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.h (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -0,0 +1,12 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#ifndef _SCUMM_STDAFX_H_
+#define _SCUMM_STDAFX_H_
+
+#include "basic/basic_stdafx.h"
+#include "scumm_plugin.h"
+
+#endif // _SCUMM_STDAFX_H_
Property changes on: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scumm_stdafx.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scummutil.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scummutil.h 2007-07-12 05:35:38 UTC (rev 28039)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/scummutil.h 2007-07-12 06:06:08 UTC (rev 28040)
@@ -4,10 +4,12 @@
#ifndef _SCUMM_UTIL_H_
#define _SCUMM_UTIL_H_
-#include "common/stream.h"
+#include "streams/stream.h"
namespace Browser {
+using namespace Core;
+
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/*
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