[Scummvm-cvs-logs] SF.net SVN: scummvm:[49463] scummvm/branches/gsoc2010-plugins/backends

toneman1138 at users.sourceforge.net toneman1138 at users.sourceforge.net
Mon Jun 7 00:24:33 CEST 2010


Revision: 49463
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49463&view=rev
Author:   toneman1138
Date:     2010-06-06 22:24:33 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
Makefile tweaked so plugins build for PS2 and uncommented code from default-saves.cpp

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
    scummvm/branches/gsoc2010-plugins/backends/saves/default/default-saves.cpp

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-06-06 21:57:09 UTC (rev 49462)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-06-06 22:24:33 UTC (rev 49463)
@@ -20,39 +20,39 @@
 ENABLED = STATIC_PLUGIN
 endif
 
-ENABLE_SCUMM = $(ENABLED)
+#ENABLE_SCUMM = $(ENABLED)
 #ENABLE_SCUMM_7_8 = $(ENABLED)
-#ENABLE_HE = $(ENABLED)
+ENABLE_HE = $(ENABLED)
 ENABLE_AGI = $(ENABLED)
-#ENABLE_AGOS = $(ENABLED)
-#ENABLE_CINE = $(ENABLED)
-#ENABLE_CRUISE = $(ENABLED)
-#ENABLE_DRASCULA = $(ENABLED)
+ENABLE_AGOS = $(ENABLED)
+ENABLE_CINE = $(ENABLED)
+ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRASCULA = $(ENABLED)
 #ENABLE_GOB = $(ENABLED)
 #ENABLE_KYRA = $(ENABLED)
-#ENABLE_LURE = $(ENABLED)
+ENABLE_LURE = $(ENABLED)
 # ENABLE_M4 = $(ENABLED)
-#ENABLE_MADE = $(ENABLED)
-#ENABLE_PARALLACTION = $(ENABLED)
-#ENABLE_QUEEN = $(ENABLED)
-#ENABLE_SAGA = $(ENABLED)
-#ENABLE_SAGA2 = $(ENABLED)
-#ENABLE_IHNM = $(ENABLED)
-#ENABLE_SKY = $(ENABLED)
-#ENABLE_SWORD1 = $(ENABLED)
-#ENABLE_SWORD2 = $(ENABLED)
+ENABLE_MADE = $(ENABLED)
+ENABLE_PARALLACTION = $(ENABLED)
+ENABLE_QUEEN = $(ENABLED)
+ENABLE_SAGA = $(ENABLED)
+ENABLE_SAGA2 = $(ENABLED)
+ENABLE_IHNM = $(ENABLED)
+ENABLE_SKY = $(ENABLED)
+ENABLE_SWORD1 = $(ENABLED)
+ENABLE_SWORD2 = $(ENABLED)
 # ENABLE_TINSEL = $(ENABLED)
-#ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TOUCHE = $(ENABLED)
 
-TARGET = elf/scummvm
+TARGET = elf/scummvm.elf
 #EXECUTABLE = $(TARGET)
 
 HAVE_GCC3 = true
 
-CC	= ee-gcc
-CXX     = ee-g++
-AS      = ee-gcc
-LD      = ee-gcc
+CC	= ee-gcc -G 0
+CXX     = ee-g++ -G 0
+AS      = ee-gcc -G 0
+LD      = ee-gcc -G 0
 AR      = ee-ar cru
 RANLIB  = ee-ranlib
 STRIP   = ee-strip
@@ -69,12 +69,8 @@
 PLUGIN_PREFIX =
 PLUGIN_SUFFIX = .plg
 PLUGIN_EXTRA_DEPS = plugin.syms elf/scummvm.elf
-PLUGIN_LDFLAGS = -nostartfiles -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-q,--just-symbols=elf/scummvm.org.elf,-Tlinkfile,--retain-symbols-file,plugin.syms -lstdc++ -lc
+PLUGIN_LDFLAGS = -nostartfiles -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-q,--just-symbols=elf/scummvm.elf,-Tplugin.ld,--retain-symbols-file,plugin.syms -lstdc++ -lc
 
-#PLUGIN_EXTRA_DEPS = plugin.ld plugin.syms scummvm-psp.elf
-#PLUGIN_LDFLAGS = -Wl -Tplugin.ld --just-symbols=scummvm-psp.org.elf --retain-symbols-file plugin.syms
-
-
 DEFINES  = -DUSE_VORBIS -DUSE_MAD -DUSE_TREMOR -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar -fno-exceptions -fno-rtti
 
 INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) 
@@ -98,17 +94,17 @@
 	backends/platform/ps2/ps2debug.o \
 	backends/platform/ps2/ps2loader.o
     
-MODULE_DIRS += .
+MODULE_DIRS += ./
 
 include $(srcdir)/Makefile.common
 
 LDFLAGS += -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T main_prog.ld #$(PS2SDK)/ee/startup/linkfile
-LDFLAGS += -G 0 -L $(PS2SDK)/ee/lib -L .
+LDFLAGS += -L $(PS2SDK)/ee/lib -L .
 LDFLAGS += $(addprefix -L$(PS2_EXTRA),$(PS2_EXTRA_LIBS)) 
 LDFLAGS += -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lmad -ltremor -lz -lm -lc -lfileXio -lkernel -lstdc++
 LDFLAGS +=
 
-all: $(TARGET).elf
+all: $(TARGET)
 
-$(TARGET).elf: $(OBJS)
+$(TARGET): $(OBJS)
 	$(LD) $(PRE_OBJS_FLAGS) $(OBJS) $(POST_OBJS_FLAGS) $(LDFLAGS) -o $@

Modified: scummvm/branches/gsoc2010-plugins/backends/saves/default/default-saves.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/saves/default/default-saves.cpp	2010-06-06 21:57:09 UTC (rev 49462)
+++ scummvm/branches/gsoc2010-plugins/backends/saves/default/default-saves.cpp	2010-06-06 22:24:33 UTC (rev 49463)
@@ -131,11 +131,11 @@
 	// There is a nicely portable workaround, too: Make this method overloadable.
 	if (remove(file.getPath().c_str()) != 0) {
 #ifndef _WIN32_WCE
-	  /*	if (errno == EACCES)
+	  	if (errno == EACCES)
 			setError(Common::kWritePermissionDenied, "Search or write permission denied: "+file.getName());
 
 		if (errno == ENOENT)
-		setError(Common::kPathDoesNotExist, "removeSavefile: '"+file.getName()+"' does not exist or path is invalid"); */
+		setError(Common::kPathDoesNotExist, "removeSavefile: '"+file.getName()+"' does not exist or path is invalid");
 #endif
 		return false;
 	} else {


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