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

[zbychs at users.sourceforge.net]

Revision: 27884
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27884&view=rev
Author:   zbychs
Date:     2007-07-03 10:56:50 -0700 (Tue, 03 Jul 2007)

Log Message:
-----------
Fixing Linux binaries. Not working at the moment...

Modified Paths:
--------------
    scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
    scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h

Modified: scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-03 16:58:16 UTC (rev 27883)
+++ scummex/branches/gsoc2007-gameresbrowser/gcc/Makefile	2007-07-03 17:56:50 UTC (rev 27884)
@@ -61,7 +61,7 @@
 
 GLOBAL_DEFINES = NDEBUG UNIX
 
-CFLAGS = $(patsubst %, -I%, $(HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) ) $(WX_FLAGS)
+CFLAGS = -g $(patsubst %, -I%, $(HEADERS_DIRS) ) $(patsubst %, -D%, $(GLOBAL_DEFINES) ) $(WX_FLAGS)
 
 MKDIR = mkdir -p
 
@@ -142,8 +142,10 @@
 
 gui: gui_dir $(GUI_TARGET)
 
+HACK_OBJ = $(CORE_OUTPUT)/CoreFileTypes.o
+
 $(GUI_TARGET): $(GUI_OBJECTS) core plugins
-	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT) -l$(CORE_LIB) -l$(PLUGINS_LIB)
+	g++ $(CFLAGS) -o $@ $(GUI_OBJECTS) $(HACK_OBJ) $(WX_LIBS) -L$(CORE_OUTPUT) -L$(PLUGINS_OUTPUT) -l$(CORE_LIB) -l$(PLUGINS_LIB)
 
 ###########################################################################################
 

Modified: scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h
===================================================================
--- scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h	2007-07-03 16:58:16 UTC (rev 27883)
+++ scummex/branches/gsoc2007-gameresbrowser/src/core/FileTypeRecognizer.h	2007-07-03 17:56:50 UTC (rev 27884)
@@ -64,7 +64,7 @@
     bool isOk() {
         return _match != NO_MATCH;
     }
-    bool operator<(const RecognizedFileType& other) {
+    bool operator<(const RecognizedFileType& other) const {
         return this->_match < other._match;
     }
 };
@@ -72,7 +72,7 @@
 typedef std::list<RecognizedFileType> RecognizedFileTypes;
 
 
-typedef std::list<const BGUID> guid_list;
+typedef std::list<BGUID> guid_list;
 
 struct ResolvedFileTypeParsers {
     static ResolvedFileTypeParsers NoParsers;
@@ -86,7 +86,7 @@
     bool isOk() {
         return _priority != NO_PARSERS;
     }
-    bool operator<(const ResolvedFileTypeParsers& other) {
+    bool operator<(const ResolvedFileTypeParsers& other) const {
         return this->_priority < other._priority;
     }
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.