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

zbychs at users.sourceforge.net zbychs at users.sourceforge.net
Mon Jul 2 15:52:34 CEST 2007 

Revision: 27854
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27854&view=rev
Author:   zbychs
Date:     2007-07-02 06:52:33 -0700 (Mon, 02 Jul 2007)

Log Message:
-----------
Now should compile under Linux/gcc and Windows/vc8.

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
    scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.dev
    scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.layout

Added Paths:
-----------
    scummex/branches/gsoc2007-gameresbrowser/gcc/
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile

Property Changed:
----------------
    scummex/branches/gsoc2007-gameresbrowser/


Property changes on: scummex/branches/gsoc2007-gameresbrowser
___________________________________________________________________
Name: svn:ignore
   - PinSlot.vcproj
PinSlot.vcproj.ELWOOD.RootBoot.user
Debug

   + PinSlot.vcproj
PinSlot.vcproj.ELWOOD.RootBoot.user
Debug
trash



Property changes on: scummex/branches/gsoc2007-gameresbrowser/gcc
___________________________________________________________________
Name: svn:ignore
   + *.bak


Added: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	                        (rev 0)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-02 13:52:33 UTC (rev 27854)
@@ -0,0 +1,155 @@
+###########################################################################################
+# 
+# Game Resource Browser
+#   GCC UNIX Makefile
+#   Tested on Fedora 7
+#
+###########################################################################################
+
+.PHONY : dep all clean 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
+
+CORE_DIR = $(SOURCES_DIR)/core
+PLUGINS_DIR_BASE = $(SOURCES_DIR)/plugins
+PLUGINS_DIR_EXT = $(SOURCES_DIR)/plugins/common
+GUI_DIR = $(SOURCES_DIR)/gui
+
+CORE_SOURCES = $(wildcard $(CORE_DIR)/*.cpp)
+CORE_OUTPUT = ./out/core
+CORE_LIB = core
+CORE_TARGET = $(CORE_OUTPUT)/lib$(CORE_LIB).a
+
+PLUGINS_SOURCES_BASE = $(wildcard $(PLUGINS_DIR_BASE)/*.cpp)
+PLUGINS_SOURCES_EXT = $(wildcard $(PLUGINS_DIR_EXT)/*.cpp)
+PLUGINS_SOURCES = $(PLUGINS_SOURCES_BASE) $(PLUGINS_SOURCES_EXT)
+PLUGINS_OUTPUT_BASE = ./out/plugins
+PLUGINS_OUTPUT_EXT = ./out/plugins/common
+PLUGINS_OUTPUT = $(PLUGINS_OUTPUT_BASE) $(PLUGINS_OUTPUT_EXT)
+PLUGINS_LIB = plugins
+PLUGINS_TARGET = $(PLUGINS_OUTPUT_BASE)/lib$(PLUGINS_LIB).a
+
+GUI_SOURCES = $(wildcard $(GUI_DIR)/*.cpp)
+GUI_OUTPUT = ./out/gui
+GUI_TARGET = $(GUI_OUTPUT)/browser
+
+CORE_OBJECTS_ = $(patsubst %.cpp,%.o, $(CORE_SOURCES) )
+PLUGINS_OBJECTS_BASE_ = $(patsubst %.cpp,%.o, $(PLUGINS_SOURCES_BASE) )
+PLUGINS_OBJECTS_EXT_ = $(patsubst %.cpp,%.o, $(PLUGINS_SOURCES_EXT) )
+PLUGINS_OBJECTS_ = $(PLUGINS_OBJECTS_BASE_) $(PLUGINS_OBJECTS_EXT_)
+GUI_OBJECTS_ = $(patsubst %.cpp,%.o, $(GUI_SOURCES) )
+
+CORE_OBJECTS = $(patsubst %, $(CORE_OUTPUT)/%, $(notdir $(CORE_OBJECTS_) ) )
+PLUGINS_OBJECTS_BASE = $(patsubst %, $(PLUGINS_OUTPUT_BASE)/%, $(notdir $(PLUGINS_OBJECTS_BASE_) ) )
+PLUGINS_OBJECTS_EXT = $(patsubst %, $(PLUGINS_OUTPUT_EXT)/%, $(notdir $(PLUGINS_OBJECTS_EXT_) ) )
+PLUGINS_OBJECTS = $(PLUGINS_OBJECTS_BASE) $(PLUGINS_OBJECTS_EXT)
+GUI_OBJECTS = $(patsubst %, $(GUI_OUTPUT)/%, $(notdir $(GUI_OBJECTS_) ) )
+
+ALL_SOURCES = $(CORE_SOURCES) $(PLUGINS_SOURCES) $(GUI_SOURCES)
+#ALL_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) )
+
+###########################################################################################
+
+WX_VERSION = 2.8
+WX_FLAGS = `wx-config --version=$(WX_VERSION) --debug=no --cxxflags`
+WX_LIBS = `wx-config --version=$(WX_VERSION) --debug=no --libs`
+
+###########################################################################################
+
+GLOBAL_DEFINES = NDEBUG UNIX
+
+CFLAGS = $(patsubst %, -I%, $(HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) ) $(WX_FLAGS)
+
+MKDIR = mkdir -p
+
+###########################################################################################
+
+all: gui copy_data
+
+###########################################################################################
+
+dep:
+	makedepend -Y -- $(CFLAGS) -- $(ALL_SOURCES)
+
+###########################################################################################
+
+clean_core:
+	rm -f $(CORE_OBJECTS) $(CORE_TARGET)
+
+clean_plugins:
+	rm -f $(PLUGINS_OBJECTS_BASE) $(PLUGINS_OBJECTS_EXT) $(PLUGINS_TARGET)
+
+clean_gui:
+	rm -f $(GUI_OBJECTS) $(GUI_TARGET)
+
+clean: clean_core clean_plugins clean_gui clean_data
+
+###########################################################################################
+
+clean_data:
+	rm -f -R $(GUI_OUTPUT)/data
+
+copy_data:
+	cp -f -R $(SOURCES_DIR)/data $(GUI_OUTPUT)/data
+
+###########################################################################################
+
+.SECONDEXPANSION:
+
+#$(ALL_OBJECTS) : %.o : %.cpp
+#	g++ $(CFLAGS) -c $< -o $@
+
+$(CORE_OBJECTS) : $(CORE_DIR)/$$(notdir $$(basename $$@) ).cpp
+	g++ $(CFLAGS) -c $< -o $@
+
+$(PLUGINS_OBJECTS_BASE) : $(PLUGINS_DIR_BASE)/$$(notdir $$(basename $$@) ).cpp
+	g++ $(CFLAGS) -c $< -o $@
+
+$(PLUGINS_OBJECTS_EXT) : $(PLUGINS_DIR_EXT)/$$(notdir $$(basename $$@) ).cpp
+	g++ $(CFLAGS) -c $< -o $@
+
+$(GUI_OBJECTS) : $(GUI_DIR)/$$(notdir $$(basename $$@) ).cpp
+	g++ $(CFLAGS) -c $< -o $@
+
+###########################################################################################
+
+core_dir:
+	$(MKDIR) $(CORE_OUTPUT)
+
+core: core_dir $(CORE_TARGET)
+
+$(CORE_TARGET) : $(CORE_OBJECTS)
+	ar rcs $@ $^
+
+###########################################################################################
+
+plugins_dir:
+	$(MKDIR) $(PLUGINS_OUTPUT_BASE)
+	$(MKDIR) $(PLUGINS_OUTPUT_EXT)
+
+plugins: plugins_dir $(PLUGINS_TARGET)
+
+$(PLUGINS_TARGET) : $(PLUGINS_OBJECTS)
+	ar rcs $@ $^
+
+###########################################################################################
+
+gui_dir:
+	$(MKDIR) $(GUI_OUTPUT)
+
+gui: gui_dir $(GUI_TARGET)
+
+$(GUI_TARGET): $(GUI_OBJECTS) core plugins
+	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT_BASE) -l$(CORE_LIB) -l$(PLUGINS_LIB)
+
+###########################################################################################
+
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+


Property changes on: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp	2007-07-02 13:44:29 UTC (rev 27853)
+++ scummex/branches/gsoc2007-gameresbrowser/src/gui/Test1.cpp	2007-07-02 13:52:33 UTC (rev 27854)
@@ -39,6 +39,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef _WIN32
+    #define NATIVE_SLASH "\\"
+#else
+    #define NATIVE_SLASH "/"
+#endif
+
 void MainForm::OnTest1(wxCommandEvent& event)
 {
     wxTreeItemId rootItem = ExplorationTree::_getTree()->
@@ -50,9 +56,9 @@
         new VirtualNodeItemData( rootDir.get() ) );
 
 
-    rootDir->addFile("Doll", "data/lalka.bmp");
-    rootDir->addFile("Dog", "data/pies.bmp");
-    rootDir->addFile("Foxes", "data/lisy.bmp");
+    rootDir->addFile("Doll", "data" NATIVE_SLASH "lalka.bmp");
+    rootDir->addFile("Dog", "data" NATIVE_SLASH "pies.bmp");
+    rootDir->addFile("Foxes", "data" NATIVE_SLASH "lisy.bmp");
 
     ObjectRegistry::get()->registerPlugin( &getTest1Plugin, true );
 

Modified: scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.dev
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.dev	2007-07-02 13:44:29 UTC (rev 27853)
+++ scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.dev	2007-07-02 13:52:33 UTC (rev 27854)
@@ -1,7 +1,7 @@
 [Project]
 FileName=Browser.dev
 Name=Browser
-UnitCount=6
+UnitCount=9
 PchHead=-1
 PchSource=-1
 Ver=3
@@ -141,3 +141,32 @@
 CompilerSet=1
 compilerType=1
 
+[Unit7]
+FileName=..\src\gui\MainForm.cpp
+CompileCpp=1
+Folder=Browser
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit8]
+FileName=..\src\gui\MainForm.h
+CompileCpp=1
+Folder=Browser
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit9]
+FileName=..\src\gui\MainForm.wxform
+Folder=Browser
+Compile=0
+Link=0
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+

Modified: scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.layout
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.layout	2007-07-02 13:44:29 UTC (rev 27853)
+++ scummex/branches/gsoc2007-gameresbrowser/wxdev/Browser.layout	2007-07-02 13:52:33 UTC (rev 27854)
@@ -44,13 +44,19 @@
 CursorRow=74
 TopLine=74
 LeftChar=1
+Open=0
+Top=0
 [Editor_6]
 CursorCol=1
 CursorRow=86
 TopLine=56
 LeftChar=1
+Open=0
+Top=0
 [Editor_8]
 CursorCol=1
 CursorRow=1
 TopLine=1
 LeftChar=1
+Open=0
+Top=0


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