[Scummvm-cvs-logs] SF.net SVN: scummvm: [27933] scummex/branches/gsoc2007-gameresbrowser
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Fri Jul 6 02:46:44 CEST 2007
Revision: 27933
http://scummvm.svn.sourceforge.net/scummvm/?rev=27933&view=rev
Author: zbychs
Date: 2007-07-05 17:46:44 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Yay! Finally working under Linux!
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
scummex/branches/gsoc2007-gameresbrowser/gcc/mkdot.sh
scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp
scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile 2007-07-06 00:46:44 UTC (rev 27933)
@@ -6,13 +6,25 @@
#
###########################################################################################
-.PHONY : pure debug dots tell dep all clean copy_data core plugins gui clean_data clean_core clean_plugins clean_gui core_dir plugins_dir gui_dir
+.PHONY : pure debug dots tell dep precomp all clean clean_precomp \
+ copy_data core plugins gui clean_data clean_core \
+ clean_plugins clean_gui core_dir plugins_dir gui_dir
###########################################################################################
SOURCES_DIR = ../src
-HEADERS_DIRS = $(SOURCES_DIR)/core $(SOURCES_DIR)/plugins $(SOURCES_DIR)/gui
+HEADERS_DIRS = $(ALL_OUTPUT) $(SOURCES_DIR)/core $(SOURCES_DIR)/plugins $(SOURCES_DIR)/gui
+CORE_GCH = $(CORE_DIR)/core_stdafx.h
+PLUGINS_GCH = $(PLUGINS_DIR)/plugins_stdafx.h
+GUI_GCH = $(GUI_DIR)/gui_stdafx.h
+ALL_GCH = $(CORE_GCH) $(PLUGINS_GCH) $(GUI_GCH)
+
+CORE_GCH_OUT = $(CORE_OUTPUT)/core_stdafx.h.gch
+PLUGINS_GCH_OUT = $(PLUGINS_OUTPUT)/plugins_stdafx.h.gch
+GUI_GCH_OUT = $(GUI_OUTPUT)/gui_stdafx.h.gch
+ALL_GCH_OUT = $(CORE_GCH_OUT) $(PLUGINS_GCH_OUT) $(GUI_GCH_OUT)
+
COMMON_DIR = $(SOURCES_DIR)/core/common
CORE_DIR = $(SOURCES_DIR)/core
PLUGINS_DIR = $(SOURCES_DIR)/plugins
@@ -47,7 +59,7 @@
ALL_SOURCES = $(COMMON_SOURCES) $(CORE_SOURCES) $(PLUGINS_SOURCES) $(GUI_SOURCES)
#ALL_OBJECTS = $(CORE_OBJECTS) $(PLUGINS_OBJECTS) $(GUI_OBJECTS)
-#ALL_OUTPUT = $(CORE_OUTPUT) $(PLUGINS_OUTPUT) $(GUI_OUTPUT)
+ALL_OUTPUT = $(CORE_OUTPUT) $(PLUGINS_OUTPUT) $(GUI_OUTPUT)
# TEST_OBJECTS = $(RAW_TEST_OBJECTS) $(filter-out main.o, $(OBJECTS) )
@@ -60,8 +72,12 @@
endif
ifeq ($(MAKE_UNICODE), no)
WX_UNICODE = no
+ UNICODE =
+ DEP_UNICODE = wxUSE_UNICODE=0
else
WX_UNICODE = yes
+ UNICODE = _UNICODE
+ DEP_UNICODE = wxUSE_UNICODE=1
endif
WX_VERSION = 2.8
@@ -81,28 +97,28 @@
ifeq ($(MAKE_DEBUG), yes)
TELL = DEBUG BUILD
- GLOBAL_DEFINES = _DEBUG UNIX $(PURE)
+ GLOBAL_DEFINES = _DEBUG UNIX $(PURE) $(UNICODE)
else
TELL = RELEASE BUILD
-# GLOBAL_DEFINES = NDEBUG UNIX $(PURE)
- GLOBAL_DEFINES = UNIX $(PURE)
+# GLOBAL_DEFINES = NDEBUG UNIX $(PURE) $(UNICODE)
+ GLOBAL_DEFINES = UNIX $(PURE) $(UNICODE)
endif
BASE_FLAGS = -g $(patsubst %, -I%, $(HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) )
CFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
-DEPFLAGS = $(BASE_FLAGS) $(filter-out -I%, $(WX_FLAGS) )
+DEPFLAGS = $(BASE_FLAGS) $(filter-out -I%, $(WX_FLAGS) ) $(DEP_UNICODE)
MKDIR = mkdir -p
###########################################################################################
-all: tell gui copy_data
+all: tell precomp gui copy_data
tell:
echo '$(TELL)'
dots:
- mkdots.sh
+ ./mkdot.sh
pure:
$(MAKE) all MAKE_PURE=yes
@@ -110,10 +126,12 @@
debug:
$(MAKE) all MAKE_DEBUG=yes
+precomp: $(ALL_GCH_OUT)
+
###########################################################################################
dep:
- makedepend -Y -- $(DEPFLAGS) -- $(ALL_SOURCES)
+ makedepend -Y -- $(DEPFLAGS) -- $(ALL_SOURCES) $(ALL_GCH)
###########################################################################################
@@ -126,8 +144,11 @@
clean_gui:
rm -f $(GUI_OBJECTS) $(GUI_TARGET)
-clean: clean_core clean_plugins clean_gui clean_data
+clean_precomp:
+ rm -f $(ALL_GCH_OUT)
+clean: clean_core clean_plugins clean_gui clean_data clean_precomp
+
###########################################################################################
clean_data:
@@ -138,6 +159,17 @@
###########################################################################################
+precomp: $(ALL_GCH_OUT)
+
+$(CORE_GCH_OUT) : $(CORE_GCH)
+ g++ $(CFLAGS) -c $< -o $@
+
+$(PLUGINS_GCH_OUT) : $(PLUGINS_GCH)
+ g++ $(CFLAGS) -c $< -o $@
+
+$(GUI_GCH_OUT) : $(GUI_GCH)
+ g++ $(CFLAGS) -c $< -o $@
+
.SECONDEXPANSION:
#$(ALL_OBJECTS) : %.o : %.cpp
@@ -193,119 +225,132 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-../src/core/common/simplefile.o: ../src/core/common/stdafx.h
+../src/core/common/simplefile.o: ../src/core/core_stdafx.h
+../src/core/common/simplefile.o: ../src/core/tostring.h
+../src/core/common/simplefile.o: ../src/core/common/common_stdafx.h
../src/core/common/simplefile.o: ../src/core/common/simplefile.h
../src/core/common/simplefile.o: ../src/core/common/stream.h
-../src/core/common/simplefile.o: ../src/core/common/stdafx.h
../src/core/common/simplefile.o: ../src/core/common/scummsys.h
-../src/core/common/stream.o: ../src/core/common/stdafx.h
+../src/core/common/stream.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/common/stream.o: ../src/core/common/common_stdafx.h
../src/core/common/stream.o: ../src/core/common/stream.h
-../src/core/common/stream.o: ../src/core/common/stdafx.h
../src/core/common/stream.o: ../src/core/common/scummsys.h
-../src/core/CoreFileTypes.o: ../src/core/common/stdafx.h
+../src/core/CoreFileTypes.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/core/CoreFileTypes.o: ../src/core/CoreFileTypes.h ../src/core/guid.h
../src/core/CoreFileTypes.o: ../src/core/safe_static.h ../src/core/debugmem.h
-../src/core/CoreIntf.o: ../src/core/common/stdafx.h ../src/core/CoreIntf.h
-../src/core/CoreIntf.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/core/CoreIntf.o: ../src/core/tostring.h ../src/core/debugmem.h
-../src/core/CoreIntf.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
+../src/core/CoreIntf.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/CoreIntf.o: ../src/core/CoreIntf.h ../src/core/pinslot.h
+../src/core/CoreIntf.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/core/CoreIntf.o: ../src/core/debugmem.h ../src/core/rcobject.h
+../src/core/CoreIntf.o: ../src/core/pinslot_detail.h
../src/core/CoreIntf.o: ../src/core/functionalex.h
../src/core/CoreIntf.o: ../src/core/common/stream.h
-../src/core/CoreIntf.o: ../src/core/common/stdafx.h
+../src/core/CoreIntf.o: ../src/core/common/common_stdafx.h
../src/core/CoreIntf.o: ../src/core/common/scummsys.h
../src/core/CoreIntf.o: ../src/core/common/simplefile.h
-../src/core/guid.o: ../src/core/common/stdafx.h ../src/core/guid.h
-../src/core/ochain.o: ../src/core/common/stdafx.h ../src/core/ochain.h
-../src/core/ochain.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/core/ochain.o: ../src/core/tostring.h ../src/core/debugmem.h
-../src/core/ochain.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
-../src/core/ochain.o: ../src/core/functionalex.h ../src/core/oregistry.h
-../src/core/ochain.o: ../src/core/plugin.h ../src/core/plugin_detail.h
-../src/core/ochain.o: ../src/core/treealgos.h
-../src/core/oregistry.o: ../src/core/common/stdafx.h ../src/core/oregistry.h
-../src/core/oregistry.o: ../src/core/plugin.h ../src/core/guid.h
-../src/core/oregistry.o: ../src/core/pinslot.h ../src/core/tostring.h
-../src/core/oregistry.o: ../src/core/debugmem.h ../src/core/rcobject.h
-../src/core/oregistry.o: ../src/core/pinslot_detail.h
+../src/core/core_stdafx.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/guid.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/guid.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/core/guid.o: ../src/core/debugmem.h
+../src/core/ochain.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/ochain.o: ../src/core/ochain.h ../src/core/pinslot.h
+../src/core/ochain.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/core/ochain.o: ../src/core/debugmem.h ../src/core/rcobject.h
+../src/core/ochain.o: ../src/core/pinslot_detail.h ../src/core/functionalex.h
+../src/core/ochain.o: ../src/core/oregistry.h ../src/core/plugin.h
+../src/core/ochain.o: ../src/core/plugin_detail.h ../src/core/treealgos.h
+../src/core/oregistry.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/oregistry.o: ../src/core/oregistry.h ../src/core/plugin.h
+../src/core/oregistry.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/core/oregistry.o: ../src/core/pinslot.h ../src/core/debugmem.h
+../src/core/oregistry.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
../src/core/oregistry.o: ../src/core/functionalex.h
../src/core/oregistry.o: ../src/core/plugin_detail.h ../src/core/ftregistry.h
../src/core/oregistry.o: ../src/core/FileTypeRecognizer.h
../src/core/oregistry.o: ../src/core/CoreIntf.h ../src/core/common/stream.h
-../src/core/oregistry.o: ../src/core/common/stdafx.h
+../src/core/oregistry.o: ../src/core/common/common_stdafx.h
../src/core/oregistry.o: ../src/core/common/scummsys.h
../src/core/oregistry.o: ../src/core/CoreFileTypes.h
-../src/core/oregistry.o: ../src/core/safe_static.h
-../src/core/pinslot.o: ../src/core/common/stdafx.h ../src/core/pinslot.h
-../src/core/pinslot.o: ../src/core/guid.h ../src/core/tostring.h
-../src/core/pinslot.o: ../src/core/debugmem.h ../src/core/rcobject.h
-../src/core/pinslot.o: ../src/core/pinslot_detail.h
+../src/core/pinslot.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/pinslot.o: ../src/core/pinslot.h ../src/core/guid.h
+../src/core/pinslot.o: ../src/core/safe_static.h ../src/core/debugmem.h
+../src/core/pinslot.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
../src/core/pinslot.o: ../src/core/functionalex.h
-../src/core/rcobject.o: ../src/core/common/stdafx.h ../src/core/rcobject.h
-../src/core/stdafx.o: ../src/core/common/stdafx.h
-../src/plugins/BMPParser.o: ../src/core/common/stdafx.h
+../src/core/rcobject.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/rcobject.o: ../src/core/rcobject.h
+../src/core/safe_static.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/safe_static.o: ../src/core/safe_static.h
+../src/plugins/BMPParser.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/BMPParser.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/plugins/BMPParser.o: ../src/plugins/BMPParser.h ../src/core/pinslot.h
-../src/plugins/BMPParser.o: ../src/core/guid.h ../src/core/tostring.h
+../src/plugins/BMPParser.o: ../src/core/guid.h ../src/core/safe_static.h
../src/plugins/BMPParser.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/plugins/BMPParser.o: ../src/core/pinslot_detail.h
../src/plugins/BMPParser.o: ../src/core/functionalex.h
../src/plugins/BMPParser.o: ../src/plugins/GUIIntf.h ../src/core/CoreIntf.h
../src/plugins/BMPParser.o: ../src/core/common/stream.h
-../src/plugins/BMPParser.o: ../src/core/common/stdafx.h
+../src/plugins/BMPParser.o: ../src/core/common/common_stdafx.h
../src/plugins/BMPParser.o: ../src/core/common/scummsys.h
../src/plugins/BMPParser.o: ../src/plugins/wx2scstream.h
-../src/plugins/BitmapPanel.o: ../src/plugins/BitmapPanel.h
-../src/plugins/Directories.o: ../src/core/common/stdafx.h
+../src/plugins/Directories.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/Directories.o: ../src/core/core_stdafx.h
+../src/plugins/Directories.o: ../src/core/tostring.h
../src/plugins/Directories.o: ../src/plugins/Directories.h
../src/plugins/Directories.o: ../src/plugins/VirtualNode.h
../src/plugins/Directories.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/plugins/Directories.o: ../src/core/tostring.h ../src/core/debugmem.h
-../src/plugins/Directories.o: ../src/core/rcobject.h
+../src/plugins/Directories.o: ../src/core/safe_static.h
+../src/plugins/Directories.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/plugins/Directories.o: ../src/core/pinslot_detail.h
../src/plugins/Directories.o: ../src/core/functionalex.h
../src/plugins/Directories.o: ../src/core/CoreIntf.h
../src/plugins/Directories.o: ../src/core/common/stream.h
-../src/plugins/Directories.o: ../src/core/common/stdafx.h
+../src/plugins/Directories.o: ../src/core/common/common_stdafx.h
../src/plugins/Directories.o: ../src/core/common/scummsys.h
../src/plugins/Directories.o: ../src/core/common/simplefile.h
-../src/plugins/DiskFileProvider.o: ../src/core/common/stdafx.h
+../src/plugins/DiskFileProvider.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/DiskFileProvider.o: ../src/core/core_stdafx.h
+../src/plugins/DiskFileProvider.o: ../src/core/tostring.h
../src/plugins/DiskFileProvider.o: ../src/plugins/DiskFileProvider.h
../src/plugins/DiskFileProvider.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/plugins/DiskFileProvider.o: ../src/core/tostring.h
+../src/plugins/DiskFileProvider.o: ../src/core/safe_static.h
../src/plugins/DiskFileProvider.o: ../src/core/debugmem.h
../src/plugins/DiskFileProvider.o: ../src/core/rcobject.h
../src/plugins/DiskFileProvider.o: ../src/core/pinslot_detail.h
../src/plugins/DiskFileProvider.o: ../src/core/functionalex.h
../src/plugins/DiskFileProvider.o: ../src/core/CoreIntf.h
../src/plugins/DiskFileProvider.o: ../src/core/common/stream.h
-../src/plugins/DiskFileProvider.o: ../src/core/common/stdafx.h
+../src/plugins/DiskFileProvider.o: ../src/core/common/common_stdafx.h
../src/plugins/DiskFileProvider.o: ../src/core/common/scummsys.h
../src/plugins/DiskFileProvider.o: ../src/core/common/simplefile.h
-../src/plugins/FileTypeRecognizer.o: ../src/core/common/stdafx.h
+../src/plugins/FileTypeRecognizer.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/FileTypeRecognizer.o: ../src/core/core_stdafx.h
+../src/plugins/FileTypeRecognizer.o: ../src/core/tostring.h
../src/plugins/FileTypeRecognizer.o: ../src/core/FileTypeRecognizer.h
../src/plugins/FileTypeRecognizer.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/plugins/FileTypeRecognizer.o: ../src/core/tostring.h
+../src/plugins/FileTypeRecognizer.o: ../src/core/safe_static.h
../src/plugins/FileTypeRecognizer.o: ../src/core/debugmem.h
../src/plugins/FileTypeRecognizer.o: ../src/core/rcobject.h
../src/plugins/FileTypeRecognizer.o: ../src/core/pinslot_detail.h
../src/plugins/FileTypeRecognizer.o: ../src/core/functionalex.h
../src/plugins/FileTypeRecognizer.o: ../src/core/CoreIntf.h
../src/plugins/FileTypeRecognizer.o: ../src/core/common/stream.h
-../src/plugins/FileTypeRecognizer.o: ../src/core/common/stdafx.h
+../src/plugins/FileTypeRecognizer.o: ../src/core/common/common_stdafx.h
../src/plugins/FileTypeRecognizer.o: ../src/core/common/scummsys.h
../src/plugins/FileTypeRecognizer.o: ../src/core/CoreFileTypes.h
-../src/plugins/FileTypeRecognizer.o: ../src/core/safe_static.h
../src/plugins/FileTypeRecognizer.o: ../src/plugins/VirtualNode.h
../src/plugins/FileTypeRecognizer.o: ../src/core/ochain.h
-../src/plugins/GUIIntf.o: ../src/core/common/stdafx.h
+../src/plugins/GUIIntf.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/GUIIntf.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/plugins/GUIIntf.o: ../src/plugins/GUIIntf.h ../src/core/pinslot.h
-../src/plugins/GUIIntf.o: ../src/core/guid.h ../src/core/tostring.h
+../src/plugins/GUIIntf.o: ../src/core/guid.h ../src/core/safe_static.h
../src/plugins/GUIIntf.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/plugins/GUIIntf.o: ../src/core/pinslot_detail.h
../src/plugins/GUIIntf.o: ../src/core/functionalex.h
-../src/plugins/ftregistry.o: ../src/core/common/stdafx.h
+../src/plugins/ftregistry.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/ftregistry.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/plugins/ftregistry.o: ../src/core/ftregistry.h ../src/core/plugin.h
-../src/plugins/ftregistry.o: ../src/core/guid.h ../src/core/pinslot.h
-../src/plugins/ftregistry.o: ../src/core/tostring.h ../src/core/debugmem.h
+../src/plugins/ftregistry.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/plugins/ftregistry.o: ../src/core/pinslot.h ../src/core/debugmem.h
../src/plugins/ftregistry.o: ../src/core/rcobject.h
../src/plugins/ftregistry.o: ../src/core/pinslot_detail.h
../src/plugins/ftregistry.o: ../src/core/functionalex.h
@@ -313,29 +358,43 @@
../src/plugins/ftregistry.o: ../src/core/FileTypeRecognizer.h
../src/plugins/ftregistry.o: ../src/core/CoreIntf.h
../src/plugins/ftregistry.o: ../src/core/common/stream.h
-../src/plugins/ftregistry.o: ../src/core/common/stdafx.h
+../src/plugins/ftregistry.o: ../src/core/common/common_stdafx.h
../src/plugins/ftregistry.o: ../src/core/common/scummsys.h
../src/plugins/ftregistry.o: ../src/core/CoreFileTypes.h
-../src/plugins/ftregistry.o: ../src/core/safe_static.h
-../src/plugins/stdafx.o: ../src/core/common/stdafx.h
-../src/plugins/wx2scstream.o: ../src/core/common/stdafx.h
+../src/plugins/plugins_stdafx.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/plugins_stdafx.o: ../src/core/core_stdafx.h
+../src/plugins/plugins_stdafx.o: ../src/core/tostring.h
+../src/plugins/wx2scstream.o: ../src/plugins/plugins_stdafx.h
+../src/plugins/wx2scstream.o: ../src/core/core_stdafx.h
+../src/plugins/wx2scstream.o: ../src/core/tostring.h
../src/plugins/wx2scstream.o: ../src/plugins/wx2scstream.h
../src/plugins/wx2scstream.o: ../src/core/common/stream.h
-../src/plugins/wx2scstream.o: ../src/core/common/stdafx.h
+../src/plugins/wx2scstream.o: ../src/core/common/common_stdafx.h
../src/plugins/wx2scstream.o: ../src/core/common/scummsys.h
../src/plugins/wx2scstream.o: ../src/core/debugmem.h
+../src/gui/BitmapPanel.o: ../src/gui/gui_stdafx.h
+../src/gui/BitmapPanel.o: ../src/plugins/plugins_stdafx.h
+../src/gui/BitmapPanel.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/gui/BitmapPanel.o: ../src/gui/BitmapPanel.h
+../src/gui/BrowserApp.o: ../src/gui/gui_stdafx.h
+../src/gui/BrowserApp.o: ../src/plugins/plugins_stdafx.h
+../src/gui/BrowserApp.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/BrowserApp.o: ../src/gui/BrowserApp.h ../src/gui/MainForm.h
../src/gui/BrowserApp.o: ../src/gui/guicon.h
+../src/gui/DirectoryPresenter.o: ../src/gui/gui_stdafx.h
+../src/gui/DirectoryPresenter.o: ../src/plugins/plugins_stdafx.h
+../src/gui/DirectoryPresenter.o: ../src/core/core_stdafx.h
+../src/gui/DirectoryPresenter.o: ../src/core/tostring.h
../src/gui/DirectoryPresenter.o: ../src/gui/DirectoryPresenter.h
../src/gui/DirectoryPresenter.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/gui/DirectoryPresenter.o: ../src/core/tostring.h
+../src/gui/DirectoryPresenter.o: ../src/core/safe_static.h
../src/gui/DirectoryPresenter.o: ../src/core/debugmem.h
../src/gui/DirectoryPresenter.o: ../src/core/rcobject.h
../src/gui/DirectoryPresenter.o: ../src/core/pinslot_detail.h
../src/gui/DirectoryPresenter.o: ../src/core/functionalex.h
../src/gui/DirectoryPresenter.o: ../src/core/ochain.h ../src/core/CoreIntf.h
../src/gui/DirectoryPresenter.o: ../src/core/common/stream.h
-../src/gui/DirectoryPresenter.o: ../src/core/common/stdafx.h
+../src/gui/DirectoryPresenter.o: ../src/core/common/common_stdafx.h
../src/gui/DirectoryPresenter.o: ../src/core/common/scummsys.h
../src/gui/DirectoryPresenter.o: ../src/plugins/VirtualNode.h
../src/gui/DirectoryPresenter.o: ../src/gui/ExplorationTree.h
@@ -344,76 +403,94 @@
../src/gui/DirectoryPresenter.o: ../src/core/ftregistry.h
../src/gui/DirectoryPresenter.o: ../src/core/FileTypeRecognizer.h
../src/gui/DirectoryPresenter.o: ../src/core/CoreFileTypes.h
-../src/gui/DirectoryPresenter.o: ../src/core/safe_static.h
+../src/gui/ExplorationTree.o: ../src/gui/gui_stdafx.h
+../src/gui/ExplorationTree.o: ../src/plugins/plugins_stdafx.h
+../src/gui/ExplorationTree.o: ../src/core/core_stdafx.h
+../src/gui/ExplorationTree.o: ../src/core/tostring.h
../src/gui/ExplorationTree.o: ../src/gui/ExplorationTree.h
../src/gui/ExplorationTree.o: ../src/gui/PanelProvider.h
../src/gui/ExplorationTree.o: ../src/core/pinslot.h ../src/core/guid.h
-../src/gui/ExplorationTree.o: ../src/core/tostring.h ../src/core/debugmem.h
-../src/gui/ExplorationTree.o: ../src/core/rcobject.h
+../src/gui/ExplorationTree.o: ../src/core/safe_static.h
+../src/gui/ExplorationTree.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/gui/ExplorationTree.o: ../src/core/pinslot_detail.h
../src/gui/ExplorationTree.o: ../src/core/functionalex.h
../src/gui/ExplorationTree.o: ../src/plugins/VirtualNode.h
../src/gui/ExplorationTree.o: ../src/core/CoreIntf.h
../src/gui/ExplorationTree.o: ../src/core/common/stream.h
-../src/gui/ExplorationTree.o: ../src/core/common/stdafx.h
+../src/gui/ExplorationTree.o: ../src/core/common/common_stdafx.h
../src/gui/ExplorationTree.o: ../src/core/common/scummsys.h
../src/gui/ExplorationTree.o: ../src/gui/DirectoryPresenter.h
../src/gui/ExplorationTree.o: ../src/core/ochain.h
+../src/gui/FilePresenter.o: ../src/gui/gui_stdafx.h
+../src/gui/FilePresenter.o: ../src/plugins/plugins_stdafx.h
+../src/gui/FilePresenter.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/FilePresenter.o: ../src/gui/FilePresenter.h
../src/gui/FilePresenter.o: ../src/gui/PanelProvider.h ../src/core/pinslot.h
-../src/gui/FilePresenter.o: ../src/core/guid.h ../src/core/tostring.h
+../src/gui/FilePresenter.o: ../src/core/guid.h ../src/core/safe_static.h
../src/gui/FilePresenter.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/gui/FilePresenter.o: ../src/core/pinslot_detail.h
../src/gui/FilePresenter.o: ../src/core/functionalex.h
../src/gui/FilePresenter.o: ../src/plugins/VirtualNode.h
../src/gui/FilePresenter.o: ../src/core/CoreIntf.h
../src/gui/FilePresenter.o: ../src/core/common/stream.h
-../src/gui/FilePresenter.o: ../src/core/common/stdafx.h
+../src/gui/FilePresenter.o: ../src/core/common/common_stdafx.h
../src/gui/FilePresenter.o: ../src/core/common/scummsys.h
+../src/gui/ImagePresenter.o: ../src/gui/gui_stdafx.h
+../src/gui/ImagePresenter.o: ../src/plugins/plugins_stdafx.h
+../src/gui/ImagePresenter.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/ImagePresenter.o: ../src/gui/ImagePresenter.h
../src/gui/ImagePresenter.o: ../src/gui/PanelProvider.h ../src/core/pinslot.h
-../src/gui/ImagePresenter.o: ../src/core/guid.h ../src/core/tostring.h
+../src/gui/ImagePresenter.o: ../src/core/guid.h ../src/core/safe_static.h
../src/gui/ImagePresenter.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/gui/ImagePresenter.o: ../src/core/pinslot_detail.h
../src/gui/ImagePresenter.o: ../src/core/functionalex.h
../src/gui/ImagePresenter.o: ../src/plugins/VirtualNode.h
../src/gui/ImagePresenter.o: ../src/core/CoreIntf.h
../src/gui/ImagePresenter.o: ../src/core/common/stream.h
-../src/gui/ImagePresenter.o: ../src/core/common/stdafx.h
+../src/gui/ImagePresenter.o: ../src/core/common/common_stdafx.h
../src/gui/ImagePresenter.o: ../src/core/common/scummsys.h
../src/gui/ImagePresenter.o: ../src/plugins/GUIIntf.h
-../src/gui/ImagePresenter.o: ../src/plugins/BitmapPanel.h
+../src/gui/ImagePresenter.o: ../src/gui/BitmapPanel.h
+../src/gui/MainForm.o: ../src/gui/gui_stdafx.h
+../src/gui/MainForm.o: ../src/plugins/plugins_stdafx.h
+../src/gui/MainForm.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/MainForm.o: ../src/gui/MainForm.h ../src/gui/ExplorationTree.h
../src/gui/MainForm.o: ../src/core/ftregistry.h ../src/core/plugin.h
-../src/gui/MainForm.o: ../src/core/guid.h ../src/core/pinslot.h
-../src/gui/MainForm.o: ../src/core/tostring.h ../src/core/debugmem.h
+../src/gui/MainForm.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/gui/MainForm.o: ../src/core/pinslot.h ../src/core/debugmem.h
../src/gui/MainForm.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
../src/gui/MainForm.o: ../src/core/functionalex.h ../src/core/plugin_detail.h
../src/gui/MainForm.o: ../src/core/FileTypeRecognizer.h
../src/gui/MainForm.o: ../src/core/CoreIntf.h ../src/core/common/stream.h
-../src/gui/MainForm.o: ../src/core/common/stdafx.h
+../src/gui/MainForm.o: ../src/core/common/common_stdafx.h
../src/gui/MainForm.o: ../src/core/common/scummsys.h
-../src/gui/MainForm.o: ../src/core/CoreFileTypes.h ../src/core/safe_static.h
-../src/gui/MainForm.o: ../src/core/oregistry.h ../src/plugins/VirtualNode.h
+../src/gui/MainForm.o: ../src/core/CoreFileTypes.h ../src/core/oregistry.h
+../src/gui/MainForm.o: ../src/plugins/VirtualNode.h
+../src/gui/PanelProvider.o: ../src/gui/gui_stdafx.h
+../src/gui/PanelProvider.o: ../src/plugins/plugins_stdafx.h
+../src/gui/PanelProvider.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/PanelProvider.o: ../src/gui/PanelProvider.h ../src/core/pinslot.h
-../src/gui/PanelProvider.o: ../src/core/guid.h ../src/core/tostring.h
+../src/gui/PanelProvider.o: ../src/core/guid.h ../src/core/safe_static.h
../src/gui/PanelProvider.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/gui/PanelProvider.o: ../src/core/pinslot_detail.h
../src/gui/PanelProvider.o: ../src/core/functionalex.h
../src/gui/PanelProvider.o: ../src/plugins/VirtualNode.h
../src/gui/PanelProvider.o: ../src/core/CoreIntf.h
../src/gui/PanelProvider.o: ../src/core/common/stream.h
-../src/gui/PanelProvider.o: ../src/core/common/stdafx.h
+../src/gui/PanelProvider.o: ../src/core/common/common_stdafx.h
../src/gui/PanelProvider.o: ../src/core/common/scummsys.h
../src/gui/PanelProvider.o: ../src/gui/ExplorationTree.h
+../src/gui/Test1.o: ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h
+../src/gui/Test1.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/Test1.o: ../src/gui/MainForm.h ../src/core/plugin.h
-../src/gui/Test1.o: ../src/core/guid.h ../src/core/pinslot.h
-../src/gui/Test1.o: ../src/core/tostring.h ../src/core/debugmem.h
+../src/gui/Test1.o: ../src/core/guid.h ../src/core/safe_static.h
+../src/gui/Test1.o: ../src/core/pinslot.h ../src/core/debugmem.h
../src/gui/Test1.o: ../src/core/rcobject.h ../src/core/pinslot_detail.h
../src/gui/Test1.o: ../src/core/functionalex.h ../src/core/plugin_detail.h
../src/gui/Test1.o: ../src/core/oregistry.h ../src/gui/ExplorationTree.h
../src/gui/Test1.o: ../src/plugins/VirtualNode.h ../src/core/CoreIntf.h
-../src/gui/Test1.o: ../src/core/common/stream.h ../src/core/common/stdafx.h
+../src/gui/Test1.o: ../src/core/common/stream.h
+../src/gui/Test1.o: ../src/core/common/common_stdafx.h
../src/gui/Test1.o: ../src/core/common/scummsys.h
../src/gui/Test1.o: ../src/plugins/Directories.h
../src/gui/Test1.o: ../src/gui/DirectoryPresenter.h ../src/core/ochain.h
@@ -421,14 +498,27 @@
../src/gui/Test1.o: ../src/gui/ImagePresenter.h ../src/gui/PanelProvider.h
../src/gui/Test1.o: ../src/gui/FilePresenter.h
../src/gui/Test1.o: ../src/core/FileTypeRecognizer.h
-../src/gui/Test1.o: ../src/core/CoreFileTypes.h ../src/core/safe_static.h
+../src/gui/Test1.o: ../src/core/CoreFileTypes.h
+../src/gui/VirtualNode.o: ../src/gui/gui_stdafx.h
+../src/gui/VirtualNode.o: ../src/plugins/plugins_stdafx.h
+../src/gui/VirtualNode.o: ../src/core/core_stdafx.h ../src/core/tostring.h
../src/gui/VirtualNode.o: ../src/plugins/VirtualNode.h ../src/core/pinslot.h
-../src/gui/VirtualNode.o: ../src/core/guid.h ../src/core/tostring.h
+../src/gui/VirtualNode.o: ../src/core/guid.h ../src/core/safe_static.h
../src/gui/VirtualNode.o: ../src/core/debugmem.h ../src/core/rcobject.h
../src/gui/VirtualNode.o: ../src/core/pinslot_detail.h
../src/gui/VirtualNode.o: ../src/core/functionalex.h ../src/core/CoreIntf.h
../src/gui/VirtualNode.o: ../src/core/common/stream.h
-../src/gui/VirtualNode.o: ../src/core/common/stdafx.h
+../src/gui/VirtualNode.o: ../src/core/common/common_stdafx.h
../src/gui/VirtualNode.o: ../src/core/common/scummsys.h
../src/gui/VirtualNode.o: ../src/gui/ExplorationTree.h
../src/gui/VirtualNode.o: ../src/core/common/simplefile.h
+../src/gui/gui_stdafx.o: ../src/gui/gui_stdafx.h
+../src/gui/gui_stdafx.o: ../src/plugins/plugins_stdafx.h
+../src/gui/gui_stdafx.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/gui/guicon.o: ../src/gui/gui_stdafx.h ../src/plugins/plugins_stdafx.h
+../src/gui/guicon.o: ../src/core/core_stdafx.h ../src/core/tostring.h
+../src/core/core_stdafx.o: ../src/core/tostring.h ../src/core/core_stdafx.h
+../src/plugins/plugins_stdafx.o: ../src/core/core_stdafx.h
+../src/plugins/plugins_stdafx.o: ../src/core/tostring.h
+../src/gui/gui_stdafx.o: ../src/plugins/plugins_stdafx.h
+../src/gui/gui_stdafx.o: ../src/core/core_stdafx.h ../src/core/tostring.h
Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/mkdot.sh
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/mkdot.sh 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/mkdot.sh 2007-07-06 00:46:44 UTC (rev 27933)
@@ -3,7 +3,7 @@
#for %%F in (*.dot) do dot -Tgif -Gsize=7.5,5 -o %%~dpnF.gif %%F
-dot -Tgif -o rootObjectChain.gif out/gui/rootObjectChain.dot
+dot -Tpng -o rootObjectChain.png out/gui/rootObjectChain.dot
#for name in out/gui/*.dot
#do
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/DirectoryPresenter.cpp 2007-07-06 00:46:44 UTC (rev 27933)
@@ -49,8 +49,8 @@
void DirectoryPresenter::doUnrealize(ObjectChain* ochain) {
ASSERT(_inodeprovider && _inodeprovider->getNode());
infoout << wxT("DirectoryPresenter::unrealize(): ")
- << (_inodeprovider ? toString(_inodeprovider->getNode()->getTreeItemName()) : wxT("<error>")) << wxT(" ")
- << (_idirectory ? _idirectory->getName() : wxT("<not expanded>")) << wxT(" ")
+ //<< (_inodeprovider ? _inodeprovider->getNode()->getTreeItemName().c_str() : wxT("<error>")) << wxT(" ")
+ << (_idirectory ? _idirectory->getName().c_str() : wxT("<not expanded>")) << wxT(" ")
<< std::endl;
ExplorationTree::get()->unregisterDirectoryPresenter(this);
@@ -126,7 +126,7 @@
return; //TODO: report error
}
- infoout << wxT("DirectoryPresenter::expand(): ") << _idirectory->getName() << std::endl;
+ infoout << wxT("DirectoryPresenter::expand(): ") << _idirectory->getName().c_str() << std::endl;
VirtualNode* parent = _inodeprovider->getNode();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.cpp 2007-07-06 00:46:44 UTC (rev 27933)
@@ -191,22 +191,26 @@
return item;
}
-void ExplorationTree::_recDel(const wxTreeItemId& item) {
+void ExplorationTree::_recDel(const wxTreeItemId& item, bool thisToo) {
ASSERT_VALID_TREE_ITEM(item);
wxTreeItemIdValue cookie;
while (true) {
wxTreeItemId child = _explorationTree->GetFirstChild(item, cookie);
if (!child.IsOk())
break;
- _recDel(child);
+ _recDel(child, true);
}
- _explorationTree->Delete(item);
+
+ if (thisToo) {
+ ASSERT_VALID_TREE_ITEM(item);
+ _explorationTree->Delete(item);
+ }
}
void ExplorationTree::deleteChildren(const wxTreeItemId& parent) {
ASSERT_VALID_TREE_ITEM(parent);
- //ExplorationTree::_getTree()->DeleteChildren( node->getTreeItem() );
- _recDel(parent);
+ _explorationTree->DeleteChildren(parent);
+ //_recDel(parent, false);
}
void ExplorationTree::setItemData(const wxTreeItemId& item, wxTreeItemData* data) {
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/ExplorationTree.h 2007-07-06 00:46:44 UTC (rev 27933)
@@ -54,7 +54,7 @@
//static wxTreeCtrl* _getTree();
//wxTreeCtrl* getTree();
wxTreeItemId appendItem(const wxTreeItemId& parent, wxString title);
- void _recDel(const wxTreeItemId& item); //HACK
+ void _recDel(const wxTreeItemId& item, bool thisToo); //HACK
void deleteChildren(const wxTreeItemId& parent);
void setItemData(const wxTreeItemId& item, wxTreeItemData* data);
wxTreeItemData* getItemData(const wxTreeItemId& item);
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp 2007-07-05 23:26:35 UTC (rev 27932)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp 2007-07-06 00:46:44 UTC (rev 27933)
@@ -163,9 +163,11 @@
void MainForm::OnTest1Cleanup(wxCommandEvent& event) {
infoout << wxT("Test1 Cleanup.") << std::endl;
#ifndef NO_BOBJECTS
- ExplorationTree::get()->deleteAllItems();
ObjectChain* rootChain = ExplorationTree::get()->getRootObjectChain();
rootChain->removeAllObjects();
+
+ //deleting the root
+ ExplorationTree::get()->deleteAllItems();
#endif
}
@@ -180,14 +182,14 @@
ASSERT(rootChain);
std::wfstream file;
- file.open(wxT("rootObjectChain.dot"), std::ios_base::out | std::ios_base::trunc);
+ file.open(wxString(wxT("rootObjectChain.dot")).mb_str(), std::ios_base::out | std::ios_base::trunc);
if (file.fail()) {
wxMessageBox(wxT("Could not create file: rootObjectChain.dot."), wxT("DumpRootObjectChain Failed"),
wxOK | wxICON_ERROR, this);
return;
}
- rootChain->dumpObjectChainStart(wxT("RootObjectChain"), file);
+ rootChain->dumpObjectChainStart(wxString(wxT("RootObjectChain")), file);
wxMessageBox(wxT("Dumped to rootObjectChain.dot."), wxT("DumpRootObjectChain"),
wxOK | wxICON_INFORMATION, this);
//#endif
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