[Scummvm-cvs-logs] SF.net SVN: scummvm: [27935] scummex/branches/gsoc2007-gameresbrowser
zbychs at users.sourceforge.net
zbychs at users.sourceforge.net
Fri Jul 6 14:34:58 CEST 2007
Revision: 27935
http://scummvm.svn.sourceforge.net/scummvm/?rev=27935&view=rev
Author: zbychs
Date: 2007-07-06 05:34:57 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Small changes in stdafxes.
Modified Paths:
--------------
scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h
scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h
scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.h
Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile 2007-07-06 01:47:17 UTC (rev 27934)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile 2007-07-06 12:34:57 UTC (rev 27935)
@@ -6,15 +6,23 @@
#
###########################################################################################
-.PHONY : pure debug dots tell dep precomp all clean clean_precomp \
+.PHONY : pure debug dots tell in-dep dep precomp in-all 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 = $(ALL_OUTPUT) $(SOURCES_DIR)/core $(SOURCES_DIR)/plugins $(SOURCES_DIR)/gui
+#SOURCES_DIR = .
+OUT_DIR = ./out
+#OUT_DIR = ../gcc/out
+DEP_HEADERS_DIRS = $(SOURCES_DIR)/core $(SOURCES_DIR)/plugins $(SOURCES_DIR)/gui
+HEADERS_DIRS = $(ALL_OUTPUT) $(DEP_HEADERS_DIRS)
+#precompilation actually makes it compile slower...
+MAKE_PRECOMP = no
+ifneq ($(MAKE_PRECOMP), no)
+
CORE_GCH = $(CORE_DIR)/core_stdafx.h
PLUGINS_GCH = $(PLUGINS_DIR)/plugins_stdafx.h
GUI_GCH = $(GUI_DIR)/gui_stdafx.h
@@ -27,26 +35,28 @@
#ALL_GCH_OUT = $(CORE_GCH_OUT) $(PLUGINS_GCH_OUT) $(GUI_GCH_OUT)
ALL_GCH_OUT = $(CORE_GCH_OUT)
+endif
+
COMMON_DIR = $(SOURCES_DIR)/core/common
CORE_DIR = $(SOURCES_DIR)/core
PLUGINS_DIR = $(SOURCES_DIR)/plugins
GUI_DIR = $(SOURCES_DIR)/gui
COMMON_SOURCES = $(wildcard $(COMMON_DIR)/*.cpp)
-COMMON_OUTPUT = ./out/core/common
+COMMON_OUTPUT = $(OUT_DIR)/core/common
CORE_SOURCES = $(wildcard $(CORE_DIR)/*.cpp)
-CORE_OUTPUT = ./out/core
+CORE_OUTPUT = $(OUT_DIR)/core
CORE_LIB = core
CORE_TARGET = $(CORE_OUTPUT)/lib$(CORE_LIB).a
PLUGINS_SOURCES = $(wildcard $(PLUGINS_DIR)/*.cpp)
-PLUGINS_OUTPUT = ./out/plugins
+PLUGINS_OUTPUT = $(OUT_DIR)/plugins
PLUGINS_LIB = plugins
PLUGINS_TARGET = $(PLUGINS_OUTPUT)/lib$(PLUGINS_LIB).a
GUI_SOURCES = $(wildcard $(GUI_DIR)/*.cpp)
-GUI_OUTPUT = ./out/gui
+GUI_OUTPUT = $(OUT_DIR)/gui
GUI_TARGET = $(GUI_OUTPUT)/browser
COMMON_OBJECTS_ = $(patsubst %.cpp,%.o, $(COMMON_SOURCES) )
@@ -72,9 +82,12 @@
else
WX_DEBUG = no
endif
+
+#below defining or not defining _UNICODE is only for sanity
+#wxWidgets redefines _UNICODE anyway
ifeq ($(MAKE_UNICODE), no)
WX_UNICODE = no
- UNICODE =
+ UNICODE =
DEP_UNICODE = wxUSE_UNICODE=0
else
WX_UNICODE = yes
@@ -106,16 +119,22 @@
GLOBAL_DEFINES = UNIX $(PURE) $(UNICODE)
endif
+DEP_BASE_FLAGS = -g $(patsubst %, -I%, $(DEP_HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) )
BASE_FLAGS = -g $(patsubst %, -I%, $(HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) )
CFLAGS = $(BASE_FLAGS) $(WX_FLAGS)
-DEPFLAGS = $(BASE_FLAGS) $(filter-out -I%, $(WX_FLAGS) ) $(DEP_UNICODE)
+DEPFLAGS = $(DEP_BASE_FLAGS) $(WX_FLAGS) $(filter-out -I%, $(WX_FLAGS) ) -D$(DEP_UNICODE)
MKDIR = mkdir -p
###########################################################################################
-all: tell precomp gui copy_data
+all:
+# cd ../src
+ $(MAKE) in-all
+# cd ../gcc
+in-all: tell precomp gui copy_data
+
tell:
echo '$(TELL)'
@@ -132,9 +151,34 @@
###########################################################################################
+ALL_D = $(ALL_SOURCES:.cpp=.d)
+
+$(ALL_D) : %.d : %.cpp
+ g++ -MM $(CFLAGS) $< > $@
+
+#$(ALL_D) : %.d : %.cpp
+# @set -e; rm -f $@; \
+# g++ -MM $(CFLAGS) $< > $@.$$$$; \
+# sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+# rm -f $@.$$$$
+
dep:
- makedepend -Y -- $(DEPFLAGS) -- $(ALL_SOURCES) $(ALL_GCH)
+ @echo "make dep is broken for now. Sorry."
+#dep: $(ALL_D)
+
+#include $(ALL_D)
+
+#broken!!!
+#DEP_ALL_SOURCES = $(patsubst $(SOURCES_DIR)%,.%, $(ALL_SOURCES) )
+#DEP_DEPFLAGS = $(patsubst $(SOURCES_DIR)%,.%, $(DEPFLAGS) )
+
+#dep:
+#1;2B $(MAKE) -C../src -f../gcc/Makefile in-dep
+
+in-dep:
+# makedepend -f../gcc/Makefile -Y -p$(OUT_DIR)/ -- $(DEP_DEPFLAGS) -- $(DEP_ALL_SOURCES)
+
###########################################################################################
clean_core:
@@ -161,8 +205,6 @@
###########################################################################################
-precomp: $(ALL_GCH_OUT)
-
$(CORE_GCH_OUT) : $(CORE_GCH)
g++ $(CFLAGS) -c $< -o $@
@@ -227,300 +269,3 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-../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/scummsys.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/scummsys.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/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/common_stdafx.h
-../src/core/CoreIntf.o: ../src/core/common/scummsys.h
-../src/core/CoreIntf.o: ../src/core/common/simplefile.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/common_stdafx.h
-../src/core/oregistry.o: ../src/core/common/scummsys.h
-../src/core/oregistry.o: ../src/core/CoreFileTypes.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/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/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/common_stdafx.h
-../src/plugins/BMPParser.o: ../src/core/common/scummsys.h
-../src/plugins/BMPParser.o: ../src/plugins/wx2scstream.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/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/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/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/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/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/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/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/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/plugins/VirtualNode.h
-../src/plugins/FileTypeRecognizer.o: ../src/core/ochain.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/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/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/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
-../src/plugins/ftregistry.o: ../src/core/plugin_detail.h
-../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/common_stdafx.h
-../src/plugins/ftregistry.o: ../src/core/common/scummsys.h
-../src/plugins/ftregistry.o: ../src/core/CoreFileTypes.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/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/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/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
-../src/gui/DirectoryPresenter.o: ../src/core/oregistry.h ../src/core/plugin.h
-../src/gui/DirectoryPresenter.o: ../src/core/plugin_detail.h
-../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/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/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/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/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/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/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/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/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/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/common_stdafx.h
-../src/gui/MainForm.o: ../src/core/common/scummsys.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/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/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/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/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
-../src/gui/Test1.o: ../src/plugins/BMPParser.h ../src/plugins/GUIIntf.h
-../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/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/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/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/src/core/core_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h 2007-07-06 01:47:17 UTC (rev 27934)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/core_stdafx.h 2007-07-06 12:34:57 UTC (rev 27935)
@@ -3,11 +3,21 @@
// are changed infrequently
//
-#pragma once
-
#ifndef _CORE_STDAFX_H_
#define _CORE_STDAFX_H_
+//core uses only wxString
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include <wx/string.h>
+
+#define ARRAY_SIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
+
+//CAUTION: wxWidgets redefines _UNICODE!
#ifdef _UNICODE
#define errout std::wcerr
#define infoout std::wcout
@@ -18,24 +28,17 @@
#define streamout std::ostream
#endif
-//core uses only wxString
-#include <wx/wxprec.h>
-
-#include <wx/string.h>
-
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
-
-#define ARRAY_SIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
#define coreString wxString
+#include "tostring.h"
#ifdef WX_PRECOMP
#include "pinslot.h"
#endif
-#include "tostring.h"
+#ifndef wxUSE_UNICODE
+ #error wxUSE_UNICODE must be defined
+#endif
#if (wxUSE_UNICODE && !defined(_UNICODE)) || (!wxUSE_UNICODE && defined(_UNICODE))
#error wxUSE_UNICODE and _UNICODE are inconsistent
Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h 2007-07-06 01:47:17 UTC (rev 27934)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/tostring.h 2007-07-06 12:34:57 UTC (rev 27935)
@@ -4,12 +4,13 @@
// Declares toString() template
//
-#pragma once
#ifndef ZZ_TO_STRING_H
#define ZZ_TO_STRING_H
#include "core_stdafx.h"
+#include <ostream>
+
namespace Browser {
/////////////////////////////////////////////////////////////////////////////
@@ -51,6 +52,10 @@
return wxString(wxConvCurrent->cMB2WX(str));
}
+#ifndef streamout
+ #error streamout not defined
+#endif
+
inline
streamout& operator<<(streamout& os, const wxString& str) {
return os << str.c_str();
Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h 2007-07-06 01:47:17 UTC (rev 27934)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/gui_stdafx.h 2007-07-06 12:34:57 UTC (rev 27935)
@@ -3,8 +3,6 @@
// are changed infrequently
//
-#pragma once
-
#ifndef _GUI_STDAFX_H_
#define _GUI_STDAFX_H_
Modified: scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.h 2007-07-06 01:47:17 UTC (rev 27934)
+++ scummex/branches/gsoc2007-gameresbrowser/src/plugins/plugins_stdafx.h 2007-07-06 12:34:57 UTC (rev 27935)
@@ -3,8 +3,6 @@
// are changed infrequently
//
-#pragma once
-
#ifndef _PLUGINS_STDAFX_H_
#define _PLUGINS_STDAFX_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