[Scummvm-cvs-logs] CVS: scummvm/backends/dc Makefile,1.20,1.21 README,1.3,1.4 selector.cpp,1.21,1.22

Marcus Comstedt marcus_c at users.sourceforge.net
Sat Mar 13 04:57:00 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9241

Modified Files:
	Makefile README selector.cpp 
Log Message:
Merged in fixes from 0.6.0 release branch.

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile	1 Feb 2004 20:00:44 -0000	1.20
+++ Makefile	13 Mar 2004 12:47:27 -0000	1.21
@@ -6,7 +6,7 @@
 VPATH = $(srcdir)
 
 CXX     = sh-elf-g++ -ml -m4-single-only
-CXXFLAGS= -O1 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
+CXXFLAGS= -O3 -Wno-multichar -funroll-loops -fschedule-insns2 -fomit-frame-pointer -fdelete-null-pointer-checks -fno-exceptions
 DEFINES = -D__DC__ -DNONSTANDARD_PORT
 LDFLAGS := -Wl,-Ttext,0x8c010000 -nostartfiles $(ronindir)/lib/crt0.o
 INCLUDES:= -I./ -I$(srcdir) -I$(srcdir)/common -I$(ronindir)/include/

Index: README
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README	3 Apr 2003 19:50:28 -0000	1.3
+++ README	13 Mar 2004 12:47:27 -0000	1.4
@@ -4,7 +4,7 @@
 If you want to compile ScummVM for your Dreamcast,
 you'll need the following:
 
-* gcc-3.3 configured as a cross-compiler for `sh-elf'
+* gcc-3.3.3 configured as a cross-compiler for `sh-elf'
   (including corresponding binutils)
 
 * newlib for sh-elf : <URL:http://mc.pp.se/dc/files/newlib-1.9.0.tar.gz>

Index: selector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/selector.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- selector.cpp	28 Feb 2004 12:57:51 -0000	1.21
+++ selector.cpp	13 Mar 2004 12:47:27 -0000	1.22
@@ -160,7 +160,7 @@
   return false;
 }
 
-static const char *checkDetect(const FilesystemNode *entry)
+static const char *checkDetect(const FilesystemNode *entry, bool unique)
 {
   FSList files;
   files.push_back(*entry);
@@ -173,18 +173,24 @@
   }
   if (candidates.isEmpty())
     return NULL;
+  if (unique && candidates.size() > 1)
+    return NULL;
   return candidates[0].name;
 }
 
 static bool isGame(const FilesystemNode *entry, char *base)
 {
   const char *fn = entry->displayName().c_str();
+  if(const char *dtct = checkDetect(entry, true)) {
+    strcpy(base, dtct);
+    return true;
+  }
   if(!strcasecmp(fn, "00.LFL") ||
      !strcasecmp(fn, "000.LFL")) {
     *base = '\0';
     return true;
   }
-  if(const char *dtct = checkDetect(entry)) {
+  if(const char *dtct = checkDetect(entry, false)) {
     strcpy(base, dtct);
     return true;
   }
@@ -198,7 +204,7 @@
     base[l-4]='\0';
     return true;
   }
-#else
+#elsif 0
   char *dot;
   if(!stricmp(fn, "LOOM.EXE"))
     return false;
@@ -306,8 +312,10 @@
 		games[curr_game].dir[i+1]='\0';
 #endif
 	      }
+#if 0
 	      if(checkExe(games[curr_game].dir, "loom"))
 		strcpy(games[curr_game].filename_base, "loomcd");
+#endif
 	    }
 	    if(uniqueGame(games[curr_game].filename_base,
 			  games[curr_game].dir, games, curr_game)) {





More information about the Scummvm-git-logs mailing list