[Scummvm-cvs-logs] SF.net SVN: scummvm: [27971] scummex/branches/gsoc2007-gameresbrowser

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Sun Jul 8 19:02:20 CEST 2007


Revision: 27971
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27971&view=rev
Author:   zbychs
Date:     2007-07-08 10:02:19 -0700 (Sun, 08 Jul 2007)

Log Message:
-----------
Fixed compilation under Linux.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
    scummex/branches/gsoc2007-gameresbrowser/gcc/deps.d
    scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
    scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-08 16:58:54 UTC (rev 27970)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-08 17:02:19 UTC (rev 27971)
@@ -39,12 +39,16 @@
 
 COMMON_DIR = $(SOURCES_DIR)/core/common
 CORE_DIR = $(SOURCES_DIR)/core
+SCUMM_DIR = $(SOURCES_DIR)/plugins/scumm
 PLUGINS_DIR = $(SOURCES_DIR)/plugins
 GUI_DIR = $(SOURCES_DIR)/gui
 
 COMMON_SOURCES = $(wildcard $(COMMON_DIR)/*.cpp)
 COMMON_OUTPUT = $(OUT_DIR)/core/common
 
+SCUMM_SOURCES = $(wildcard $(SCUMM_DIR)/*.cpp)
+SCUMM_OUTPUT = $(OUT_DIR)/plugins/scumm
+
 CORE_SOURCES = $(wildcard $(CORE_DIR)/*.cpp)
 CORE_OUTPUT = $(OUT_DIR)/core
 CORE_LIB = core
@@ -60,17 +64,19 @@
 GUI_TARGET = $(GUI_OUTPUT)/browser
 
 COMMON_OBJECTS_ = $(patsubst %.cpp,%.o, $(COMMON_SOURCES) )
+SCUMM_OBJECTS_ = $(patsubst %.cpp,%.o, $(SCUMM_SOURCES) )
 CORE_OBJECTS_ = $(patsubst %.cpp,%.o, $(CORE_SOURCES) )
 PLUGINS_OBJECTS_ = $(patsubst %.cpp,%.o, $(PLUGINS_SOURCES) )
 GUI_OBJECTS_ = $(patsubst %.cpp,%.o, $(GUI_SOURCES) )
 
 COMMON_OBJECTS = $(patsubst %, $(COMMON_OUTPUT)/%, $(notdir $(COMMON_OBJECTS_) ) )
+SCUMM_OBJECTS = $(patsubst %, $(SCUMM_OUTPUT)/%, $(notdir $(SCUMM_OBJECTS_) ) )
 CORE_OBJECTS = $(patsubst %, $(CORE_OUTPUT)/%, $(notdir $(CORE_OBJECTS_) ) )
 PLUGINS_OBJECTS = $(patsubst %, $(PLUGINS_OUTPUT)/%, $(notdir $(PLUGINS_OBJECTS_) ) )
 GUI_OBJECTS = $(patsubst %, $(GUI_OUTPUT)/%, $(notdir $(GUI_OBJECTS_) ) )
 
-ALL_SOURCES = $(COMMON_SOURCES) $(CORE_SOURCES) $(PLUGINS_SOURCES) $(GUI_SOURCES)
-ALL_OBJECTS = $(CORE_OBJECTS) $(PLUGINS_OBJECTS) $(GUI_OBJECTS)
+ALL_SOURCES = $(COMMON_SOURCES) $(SCUMM_SOURCES) $(CORE_SOURCES) $(PLUGINS_SOURCES) $(GUI_SOURCES)
+ALL_OBJECTS = $(COMMON_OBJECTS) $(SCUMM_OBJECTS) $(CORE_OBJECTS) $(PLUGINS_OBJECTS) $(GUI_OBJECTS)
 ALL_OUTPUT = $(CORE_OUTPUT) $(PLUGINS_OUTPUT) $(GUI_OUTPUT)
 
 # TEST_OBJECTS = $(RAW_TEST_OBJECTS) $(filter-out main.o, $(OBJECTS) )
@@ -203,7 +209,7 @@
 	rm -f $(COMMON_OBJECTS) $(CORE_OBJECTS) $(CORE_TARGET)
 
 clean_plugins:
-	rm -f $(PLUGINS_OBJECTS) $(PLUGINS_TARGET)
+	rm -f $(SCUMM_OBJECTS) $(PLUGINS_OBJECTS) $(PLUGINS_TARGET)
 
 clean_gui:
 	rm -f $(GUI_OBJECTS) $(GUI_TARGET)
@@ -246,6 +252,9 @@
 $(COMMON_OBJECTS) : $(COMMON_DIR)/$$(notdir $$(basename $$@) ).cpp
 	g++ $(CFLAGS) -c $< -o $@
 
+$(SCUMM_OBJECTS) : $(SCUMM_DIR)/$$(notdir $$(basename $$@) ).cpp
+	g++ $(CFLAGS) -c $< -o $@
+
 $(GUI_OBJECTS) : $(GUI_DIR)/$$(notdir $$(basename $$@) ).cpp
 	g++ $(CFLAGS) -c $< -o $@
 
@@ -263,11 +272,12 @@
 ###########################################################################################
 
 plugins_dir:
+	$(MKDIR) $(SCUMM_OUTPUT)
 	$(MKDIR) $(PLUGINS_OUTPUT)
 
 plugins: plugins_dir $(PLUGINS_TARGET)
 
-$(PLUGINS_TARGET) : $(PLUGINS_OBJECTS)
+$(PLUGINS_TARGET) : $(SCUMM_OBJECTS) $(PLUGINS_OBJECTS)
 	ar rcs $@ $^
 
 ###########################################################################################
@@ -277,7 +287,8 @@
 
 gui: gui_dir $(GUI_TARGET)
 
-HACK_OBJS = $(CORE_OUTPUT)/CoreFileTypes.o $(CORE_OUTPUT)/CoreIntf.o 
+HACK_OBJS = $(CORE_OUTPUT)/CoreFileTypes.o $(CORE_OUTPUT)/CoreInterfaces.o \
+	    $(COMMON_OUTPUT)/xorstream.o 
 
 $(GUI_TARGET): $(GUI_OBJECTS) core plugins
 	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(HACK_OBJS) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT) -l$(CORE_LIB) -l$(PLUGINS_LIB)

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/deps.d
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/deps.d	2007-07-08 16:58:54 UTC (rev 27970)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/deps.d	2007-07-08 17:02:19 UTC (rev 27971)
@@ -1,227 +0,0 @@
-
-out/core/common/simplefile.o: ../src/core/common/simplefile.cpp \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/simplefile.h ../src/core/common/stream.h \
-  ../src/core/common/scummsys.h
-out/core/common/stream.o: ../src/core/common/stream.cpp \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/stream.h ../src/core/common/scummsys.h
-out/core/CoreFileTypes.o: ../src/core/CoreFileTypes.cpp \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/CoreFileTypes.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h
-out/core/CoreIntf.o: ../src/core/CoreIntf.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/CoreIntf.h ../src/core/pinslot.h \
-  ../src/core/guid.h ../src/core/safe_static.h ../src/core/debugmem.h \
-  ../src/core/rcobject.h ../src/core/pinslot_detail.h \
-  ../src/core/functionalex.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/core/common/simplefile.h ../src/core/common/stream.h
-out/core/core_stdafx.o: ../src/core/core_stdafx.cpp \
-  ../src/core/core_stdafx.h ../src/core/tostring.h
-out/core/guid.o: ../src/core/guid.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/debugmem.h
-out/core/ochain.o: ../src/core/ochain.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/ochain.h ../src/core/pinslot.h \
-  ../src/core/guid.h ../src/core/safe_static.h ../src/core/debugmem.h \
-  ../src/core/rcobject.h ../src/core/pinslot_detail.h \
-  ../src/core/functionalex.h ../src/core/oregistry.h ../src/core/plugin.h \
-  ../src/core/plugin_detail.h ../src/core/treealgos.h
-out/core/oregistry.o: ../src/core/oregistry.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/oregistry.h ../src/core/plugin.h \
-  ../src/core/guid.h ../src/core/safe_static.h ../src/core/pinslot.h \
-  ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/plugin_detail.h ../src/core/ftregistry.h \
-  ../src/core/FileTypeRecognizer.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/core/CoreFileTypes.h
-out/core/pinslot.o: ../src/core/pinslot.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h
-out/core/rcobject.o: ../src/core/rcobject.cpp ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/rcobject.h
-out/core/safe_static.o: ../src/core/safe_static.cpp \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/safe_static.h
-out/plugins/BMPParser.o: ../src/plugins/BMPParser.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/BMPParser.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/plugins/GUIIntf.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/plugins/wx2scstream.h \
-  ../src/core/common/stream.h
-out/plugins/Directories.o: ../src/plugins/Directories.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/Directories.h ../src/plugins/VirtualNode.h \
-  ../src/core/pinslot.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/CoreIntf.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/core/common/simplefile.h ../src/core/common/stream.h \
-  ../src/core/tostring.h
-out/plugins/DiskFileProvider.o: ../src/plugins/DiskFileProvider.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/DiskFileProvider.h ../src/core/pinslot.h \
-  ../src/core/guid.h ../src/core/safe_static.h ../src/core/debugmem.h \
-  ../src/core/rcobject.h ../src/core/pinslot_detail.h \
-  ../src/core/functionalex.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/core/common/simplefile.h \
-  ../src/core/common/stream.h
-out/plugins/FileTypeRecognizer.o: ../src/plugins/FileTypeRecognizer.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/core/FileTypeRecognizer.h ../src/core/pinslot.h \
-  ../src/core/guid.h ../src/core/safe_static.h ../src/core/debugmem.h \
-  ../src/core/rcobject.h ../src/core/pinslot_detail.h \
-  ../src/core/functionalex.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/core/CoreFileTypes.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/ochain.h ../src/core/safe_static.h
-out/plugins/GUIIntf.o: ../src/plugins/GUIIntf.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/GUIIntf.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h
-out/plugins/ftregistry.o: ../src/plugins/ftregistry.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/core/ftregistry.h ../src/core/plugin.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/pinslot.h ../src/core/debugmem.h \
-  ../src/core/rcobject.h ../src/core/pinslot_detail.h \
-  ../src/core/functionalex.h ../src/core/plugin_detail.h \
-  ../src/core/FileTypeRecognizer.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/core/CoreFileTypes.h
-out/plugins/plugins_stdafx.o: ../src/plugins/plugins_stdafx.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h
-out/plugins/wx2scstream.o: ../src/plugins/wx2scstream.cpp \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/wx2scstream.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/core/debugmem.h
-out/gui/BitmapPanel.o: ../src/gui/BitmapPanel.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/gui/BitmapPanel.h
-out/gui/BrowserApp.o: ../src/gui/BrowserApp.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/gui/BrowserApp.h ../src/gui/MainForm.h ../src/gui/guicon.h
-out/gui/DirectoryPresenter.o: ../src/gui/DirectoryPresenter.cpp \
-  ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/gui/DirectoryPresenter.h \
-  ../src/core/pinslot.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/ochain.h ../src/core/CoreIntf.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/gui/ExplorationTree.h ../src/core/oregistry.h \
-  ../src/core/plugin.h ../src/core/plugin_detail.h \
-  ../src/core/ftregistry.h ../src/core/FileTypeRecognizer.h \
-  ../src/core/CoreIntf.h ../src/core/CoreFileTypes.h
-out/gui/ExplorationTree.o: ../src/gui/ExplorationTree.cpp \
-  ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/gui/ExplorationTree.h \
-  ../src/gui/PanelProvider.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/gui/DirectoryPresenter.h \
-  ../src/core/ochain.h ../src/core/CoreIntf.h
-out/gui/FilePresenter.o: ../src/gui/FilePresenter.cpp \
-  ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/gui/FilePresenter.h \
-  ../src/gui/PanelProvider.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/core/CoreIntf.h
-out/gui/ImagePresenter.o: ../src/gui/ImagePresenter.cpp \
-  ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/gui/ImagePresenter.h \
-  ../src/gui/PanelProvider.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/plugins/GUIIntf.h \
-  ../src/gui/BitmapPanel.h
-out/gui/MainForm.o: ../src/gui/MainForm.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h ../src/gui/MainForm.h \
-  ../src/gui/ExplorationTree.h ../src/core/ftregistry.h \
-  ../src/core/plugin.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/pinslot.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/plugin_detail.h ../src/core/FileTypeRecognizer.h \
-  ../src/core/CoreIntf.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/core/CoreFileTypes.h ../src/core/oregistry.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/safe_static.h
-out/gui/PanelProvider.o: ../src/gui/PanelProvider.cpp \
-  ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h \
-  ../src/core/core_stdafx.h ../src/core/tostring.h \
-  ../src/core/core_stdafx.h ../src/gui/PanelProvider.h \
-  ../src/core/pinslot.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h \
-  ../src/core/common/stream.h ../src/core/common/common_stdafx.h \
-  ../src/core/common/scummsys.h ../src/gui/ExplorationTree.h
-out/gui/Test1.o: ../src/gui/Test1.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h ../src/gui/MainForm.h \
-  ../src/core/plugin.h ../src/core/guid.h ../src/core/safe_static.h \
-  ../src/core/pinslot.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/plugin_detail.h ../src/core/oregistry.h \
-  ../src/gui/ExplorationTree.h ../src/plugins/VirtualNode.h \
-  ../src/core/CoreIntf.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/plugins/Directories.h ../src/plugins/VirtualNode.h \
-  ../src/gui/DirectoryPresenter.h ../src/core/ochain.h \
-  ../src/core/CoreIntf.h ../src/plugins/BMPParser.h \
-  ../src/plugins/GUIIntf.h ../src/gui/ImagePresenter.h \
-  ../src/gui/PanelProvider.h ../src/plugins/GUIIntf.h \
-  ../src/gui/FilePresenter.h ../src/core/FileTypeRecognizer.h \
-  ../src/core/CoreIntf.h ../src/core/CoreFileTypes.h
-out/gui/VirtualNode.o: ../src/gui/VirtualNode.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h \
-  ../src/plugins/VirtualNode.h ../src/core/pinslot.h ../src/core/guid.h \
-  ../src/core/safe_static.h ../src/core/debugmem.h ../src/core/rcobject.h \
-  ../src/core/pinslot_detail.h ../src/core/functionalex.h \
-  ../src/core/CoreIntf.h ../src/core/common/stream.h \
-  ../src/core/common/common_stdafx.h ../src/core/common/scummsys.h \
-  ../src/gui/ExplorationTree.h ../src/core/common/simplefile.h \
-  ../src/core/common/stream.h
-out/gui/gui_stdafx.o: ../src/gui/gui_stdafx.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h
-out/gui/guicon.o: ../src/gui/guicon.cpp ../src/gui/gui_stdafx.h \
-  ../src/plugins/plugins_stdafx.h ../src/core/core_stdafx.h \
-  ../src/core/tostring.h ../src/core/core_stdafx.h

Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h	2007-07-08 16:58:54 UTC (rev 27970)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/ScummParser.h	2007-07-08 17:02:19 UTC (rev 27971)
@@ -41,7 +41,7 @@
 	IDirectory* getScummBlockDirectory();
 	void releaseScummBlockDirectory(IDirectory* iface);
 
-	static ScummBlock* ScummParser::getScummBlock(Common::SeekableReadStream* stream);
+	static ScummBlock* getScummBlock(Common::SeekableReadStream* stream);
 };
 
 /////////////////////////////////////////////////////////////////////////////

Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp	2007-07-08 16:58:54 UTC (rev 27970)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/scumm/resource.cpp	2007-07-08 17:02:19 UTC (rev 27971)
@@ -30,6 +30,8 @@
 
 #include "plugins_stdafx.h"
 
+#include "guid.h"
+
 #include "scumm/resource.h"
 #include "scumm/ScummFileTypes.h"
 


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