[Scummvm-cvs-logs] CVS: scummvm/backends/psp Makefile,1.4,1.5 README.PSP,1.4,1.5

Joost Peters joostp at users.sourceforge.net
Wed Oct 26 15:37:05 CEST 2005


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

Modified Files:
	Makefile README.PSP 
Log Message:
Convert to Unix newlines


Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/psp/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	30 Sep 2005 23:13:25 -0000	1.4
+++ Makefile	26 Oct 2005 22:35:29 -0000	1.5
@@ -1,109 +1,109 @@
-# SCUMMVM-PSP MakeFile
-# $Header$
-
-#control build
-DISABLE_SCALERS = true
-DISABLE_HQ_SCALERS = true
-DISABLE_KYRA = true
-
-srcdir = ../..
-VPATH = $(srcdir)
-HAVE_GCC3 = false
-
-PSPSDK=$(shell psp-config --pspsdk-path)
-PSPBIN = $(PSPSDK)/../bin
-LDFLAGS =
-
-CXX     = psp-g++
-AS      = psp-gcc
-LD      = psp-gcc
-AR      = psp-ar cru
-RANLIB  = psp-ranlib
-STRIP   = psp-strip
-MKDIR 	= mkdir -p
-RM 	= rm -f
-MKSFO	= mksfo
-PACK_PBP = pack-pbp
-FIXUP	= psp-fixup-imports
-
-INCDIR = ../../
-
-#check PSPSDK presence
-ifeq ($(PSPSDK),)
-$(error $$(PSPSDK) is undefined.  Use "PSPSDK := $$(shell psp-config --pspsdk-path)" in your Makefile)
-endif
-
-# Add in PSPSDK includes and libraries.
-INCDIR   := $(INCDIR) . $(PSPSDK)/include
-LIBDIR   := $(LIBDIR) . $(PSPSDK)/lib
-
-CFLAGS = -O2 -G0 -Wall -D__PSP__ -DNONSTANDARD_PORT -DUSE_ZLIB -Wno-multichar `$(PSPBIN)/sdl-config --cflags` 
-CFLAGS	:= $(addprefix -I,$(INCDIR)) $(CFLAGS)
-LDFLAGS := $(addprefix -L,$(LIBDIR)) $(LDFLAGS)
-LIBS     = 
-
-#comment this out if you don't want to use libmad
-CFLAGS	+= -DUSE_MAD
-LIBS	+= -lmad 
-
-#comment this out if you don't want to use libtremor
-CFLAGS	+= -DUSE_VORBIS -DUSE_TREMOR
-LIBS	+= -lvorbisidec
-
-#comment this out if you don't want to use libmpeg2
-CFLAGS	+= -DUSE_MPEG2
-LIBS	+= -lmpeg2
-
-LIBS    += `$(PSPBIN)/sdl-config --libs` -lz -lstdc++ -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lc -lpspuser -lpspkernel
-
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS) -fno-exceptions -fno-rtti
-ASFLAGS  := $(CFLAGS) $(ASFLAGS)
-
-TARGET = scummvm-psp
-OBJS := psp_main.o \
-	psp_fs.o \
-	osys_psp.o \
-	osys_psp_gu.o \
-	kbd_ss_c.o \
-	kbd_s_c.o \
-	kbd_ls_c.o \
-	kbd_l_c.o \
-	trace.o
-
-MODULE_DIRS += .
-
-include $(srcdir)/Makefile.common
-
-PSP_EBOOT_SFO = param.sfo
-PSP_EBOOT_TITLE = ScummVM-PSP
-PSP_EBOOT = EBOOT.PBP
-PSP_EBOOT_ICON = icon0.png
-PSP_EBOOT_ICON1 = NULL
-PSP_EBOOT_PIC0 = pic0.png
-PSP_EBOOT_PIC1 = pic1.png
-PSP_EBOOT_SND0 = NULL
-PSP_EBOOT_PSAR = NULL
-
-all: $(PSP_EBOOT)
-
-$(TARGET).elf: $(OBJS)
-	$(LD) $^ $(LIBS) -o $@
-	$(FIXUP) $@
-
-$(PSP_EBOOT_SFO):
-	$(MKSFO) '$(PSP_EBOOT_TITLE)' $@
-
-$(PSP_EBOOT): $(TARGET).elf $(PSP_EBOOT_SFO)
-	$(STRIP) $(TARGET).elf
-	$(PACK_PBP) $@ $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) $(PSP_EBOOT_ICON1) \
-		$(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) $(PSP_EBOOT_SND0)  \
-		$(TARGET).elf $(PSP_EBOOT_PSAR)
-
-kxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
-	mkdir -p "$(TARGET)"
-	$(STRIP) $(TARGET).elf -o $(TARGET)/$(PSP_EBOOT)
-	mkdir -p "$(TARGET)%"
-	$(PACK_PBP) "$(TARGET)%/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON)  \
-		$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1)  \
-		$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
-	
+# SCUMMVM-PSP MakeFile
+# $Header$
+
+#control build
+DISABLE_SCALERS = true
+DISABLE_HQ_SCALERS = true
+DISABLE_KYRA = true
+
+srcdir = ../..
+VPATH = $(srcdir)
+HAVE_GCC3 = false
+
+PSPSDK=$(shell psp-config --pspsdk-path)
+PSPBIN = $(PSPSDK)/../bin
+LDFLAGS =
+
+CXX     = psp-g++
+AS      = psp-gcc
+LD      = psp-gcc
+AR      = psp-ar cru
+RANLIB  = psp-ranlib
+STRIP   = psp-strip
+MKDIR 	= mkdir -p
+RM 	= rm -f
+MKSFO	= mksfo
+PACK_PBP = pack-pbp
+FIXUP	= psp-fixup-imports
+
+INCDIR = ../../
+
+#check PSPSDK presence
+ifeq ($(PSPSDK),)
+$(error $$(PSPSDK) is undefined.  Use "PSPSDK := $$(shell psp-config --pspsdk-path)" in your Makefile)
+endif
+
+# Add in PSPSDK includes and libraries.
+INCDIR   := $(INCDIR) . $(PSPSDK)/include
+LIBDIR   := $(LIBDIR) . $(PSPSDK)/lib
+
+CFLAGS = -O2 -G0 -Wall -D__PSP__ -DNONSTANDARD_PORT -DUSE_ZLIB -Wno-multichar `$(PSPBIN)/sdl-config --cflags` 
+CFLAGS	:= $(addprefix -I,$(INCDIR)) $(CFLAGS)
+LDFLAGS := $(addprefix -L,$(LIBDIR)) $(LDFLAGS)
+LIBS     = 
+
+#comment this out if you don't want to use libmad
+CFLAGS	+= -DUSE_MAD
+LIBS	+= -lmad 
+
+#comment this out if you don't want to use libtremor
+CFLAGS	+= -DUSE_VORBIS -DUSE_TREMOR
+LIBS	+= -lvorbisidec
+
+#comment this out if you don't want to use libmpeg2
+CFLAGS	+= -DUSE_MPEG2
+LIBS	+= -lmpeg2
+
+LIBS    += `$(PSPBIN)/sdl-config --libs` -lz -lstdc++ -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lc -lpspuser -lpspkernel
+
+CXXFLAGS := $(CFLAGS) $(CXXFLAGS) -fno-exceptions -fno-rtti
+ASFLAGS  := $(CFLAGS) $(ASFLAGS)
+
+TARGET = scummvm-psp
+OBJS := psp_main.o \
+	psp_fs.o \
+	osys_psp.o \
+	osys_psp_gu.o \
+	kbd_ss_c.o \
+	kbd_s_c.o \
+	kbd_ls_c.o \
+	kbd_l_c.o \
+	trace.o
+
+MODULE_DIRS += .
+
+include $(srcdir)/Makefile.common
+
+PSP_EBOOT_SFO = param.sfo
+PSP_EBOOT_TITLE = ScummVM-PSP
+PSP_EBOOT = EBOOT.PBP
+PSP_EBOOT_ICON = icon0.png
+PSP_EBOOT_ICON1 = NULL
+PSP_EBOOT_PIC0 = pic0.png
+PSP_EBOOT_PIC1 = pic1.png
+PSP_EBOOT_SND0 = NULL
+PSP_EBOOT_PSAR = NULL
+
+all: $(PSP_EBOOT)
+
+$(TARGET).elf: $(OBJS)
+	$(LD) $^ $(LIBS) -o $@
+	$(FIXUP) $@
+
+$(PSP_EBOOT_SFO):
+	$(MKSFO) '$(PSP_EBOOT_TITLE)' $@
+
+$(PSP_EBOOT): $(TARGET).elf $(PSP_EBOOT_SFO)
+	$(STRIP) $(TARGET).elf
+	$(PACK_PBP) $@ $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON) $(PSP_EBOOT_ICON1) \
+		$(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1) $(PSP_EBOOT_SND0)  \
+		$(TARGET).elf $(PSP_EBOOT_PSAR)
+
+kxploit: $(TARGET).elf $(PSP_EBOOT_SFO)
+	mkdir -p "$(TARGET)"
+	$(STRIP) $(TARGET).elf -o $(TARGET)/$(PSP_EBOOT)
+	mkdir -p "$(TARGET)%"
+	$(PACK_PBP) "$(TARGET)%/$(PSP_EBOOT)" $(PSP_EBOOT_SFO) $(PSP_EBOOT_ICON)  \
+		$(PSP_EBOOT_ICON1) $(PSP_EBOOT_PIC0) $(PSP_EBOOT_PIC1)  \
+		$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
+	

Index: README.PSP
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/psp/README.PSP,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README.PSP	28 Sep 2005 09:21:30 -0000	1.4
+++ README.PSP	26 Oct 2005 22:35:29 -0000	1.5
@@ -1,106 +1,106 @@
-ScummVM-PSP 0.8.0CVS README 
-===========================
-
-Installation
-============
- - Copy the relevant game datafiles to your memory stick (location
-   doesn't matter).
- - Install ScummVM like any other homebrew
- - Run ScummVM and use the launcher to add games and run them
-
-
-Controls
-========
-
-Left trigger 		- ESC
-Right trigger 		- Enter 
-Analog 			- Mouse movement
-Directionals		- Mouse movement
-Analog + triangle	- Fine control mouse
-Cross 			- Mouse button 1
-Circle			- Mouse button 2
-Square			- '.' (skip dialogue in some games)
-Select			- Show/Hide Virtual Keyboard
-Start			- F5
-
-Notes
-=====
-
-- While it's possible to compress certain game resources to reduce their size,
-  this can (and usually will) cause games (especially animation) to be choppy
-  sometimes, as it ofcourse needs extra CPU power to decode these files.
-  As such, it is recommended to play games in their original, uncompressed,
-  form whenever possible.
-
-
-Frequently Asked Questions
-==========================
-
-Q:  What do I need to run the games?
-A:  A 1.00 or 1.50 firmware PSP and the necessary datafiles for the game you
-    want to play and obviously this ScummVM port.
-
-Q:  Can I run this on my 1.52/1.52/2.00 firmware PSP?
-A:  No, you can't do this 'directly' as of yet.
-    A method exists for 'downgrading' a 2.00 firmware PSP to 1.50,
-    however, the details of this are beyond the scope of this document.
-
-Q:  My Monkey Island 1 doesn't have any music, what gives?
-A:  If your version of Monkey Island came on a CD then it has the music
-    as CD Audio tracks. You need to rip those to MP3/Ogg and copy them
-    to the same directory as the game datafiles for music to work.
-
-Q:  Game X crashes, or feature Y doesn't work. Can you fix this?
-A:  Possibly.  
-    Because of the large amount of games ScummVM supports we obviously haven't
-    played them all start-to-finish on the PSP, so it's possible there
-    are bugs or issues that we're not aware of.
-    When you encounter such a bug, please use the "Bug Tracker" you find linked
-    on the ScummVM website, and mention all relevant info (i.e. that you're
-    using the PSP version, which ScummVM version it is, if the problem exists
-    in a recent PC CVS version, a detailed description of the problem,
-    and if at all possible a nearby savegame), this will make it much easier
-    for us to reproduce (and hopefully fix) the problem.
-
-
-Building the source code
-========================
-To build ScummVM for PSP you need:
-
-- PSP toolchain	(svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
-
-- PSPSDK 	(svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
-  		Note: This usually gets installed by the PSP toolchain,
-	 	so you don't have to do it manually.
-
-- SDL		(svn co svn://svn.pspdev.org/psp/trunk/SDL)
-
-- zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
-
-- libmad(*)	(svn co svn://svn.pspdev.org/psp/trunk/libmad)
-
-- libTremor(*)	(svn co svn://svn.pspdev.org/psp/trunk/libTremor)
-
-- libmpeg2(*)  	(http://libmpeg2.sf.net)
-		Note: As this is not in pspdev svn, you'll need to build
-		it manually. Adding a psp target/host to config.sub and
-		using a configure line similar to the SDL port worked for
-		me.
-
-(*) = optional
-
-When you've installed these libraries (read their README.PSP for instructions),
-type "make" in the backends/psp directory to build an 1.00 firmware EBOOT.PBP,
-or "make kxploit" to build the 1.50/kxploit EBOOT.PBPs
-
-You can control most of the build process (engines and libraries used) from
-the Makefile.
-
-
-Port Authors
-============
-
-Joost Peters   (joostp at scummvm.org)
-Paolo Costabel (paoloc at pacbell.net)
-Thomas Mayer   (tommybear at internode.on.net)
-
+ScummVM-PSP 0.8.0CVS README 
+===========================
+
+Installation
+============
+ - Copy the relevant game datafiles to your memory stick (location
+   doesn't matter).
+ - Install ScummVM like any other homebrew
+ - Run ScummVM and use the launcher to add games and run them
+
+
+Controls
+========
+
+Left trigger 		- ESC
+Right trigger 		- Enter 
+Analog 			- Mouse movement
+Directionals		- Mouse movement
+Analog + triangle	- Fine control mouse
+Cross 			- Mouse button 1
+Circle			- Mouse button 2
+Square			- '.' (skip dialogue in some games)
+Select			- Show/Hide Virtual Keyboard
+Start			- F5
+
+Notes
+=====
+
+- While it's possible to compress certain game resources to reduce their size,
+  this can (and usually will) cause games (especially animation) to be choppy
+  sometimes, as it ofcourse needs extra CPU power to decode these files.
+  As such, it is recommended to play games in their original, uncompressed,
+  form whenever possible.
+
+
+Frequently Asked Questions
+==========================
+
+Q:  What do I need to run the games?
+A:  A 1.00 or 1.50 firmware PSP and the necessary datafiles for the game you
+    want to play and obviously this ScummVM port.
+
+Q:  Can I run this on my 1.52/1.52/2.00 firmware PSP?
+A:  No, you can't do this 'directly' as of yet.
+    A method exists for 'downgrading' a 2.00 firmware PSP to 1.50,
+    however, the details of this are beyond the scope of this document.
+
+Q:  My Monkey Island 1 doesn't have any music, what gives?
+A:  If your version of Monkey Island came on a CD then it has the music
+    as CD Audio tracks. You need to rip those to MP3/Ogg and copy them
+    to the same directory as the game datafiles for music to work.
+
+Q:  Game X crashes, or feature Y doesn't work. Can you fix this?
+A:  Possibly.  
+    Because of the large amount of games ScummVM supports we obviously haven't
+    played them all start-to-finish on the PSP, so it's possible there
+    are bugs or issues that we're not aware of.
+    When you encounter such a bug, please use the "Bug Tracker" you find linked
+    on the ScummVM website, and mention all relevant info (i.e. that you're
+    using the PSP version, which ScummVM version it is, if the problem exists
+    in a recent PC CVS version, a detailed description of the problem,
+    and if at all possible a nearby savegame), this will make it much easier
+    for us to reproduce (and hopefully fix) the problem.
+
+
+Building the source code
+========================
+To build ScummVM for PSP you need:
+
+- PSP toolchain	(svn co svn://svn.pspdev.org/psp/trunk/psptoolchain)
+
+- PSPSDK 	(svn co svn://svn.pspdev.org/psp/trunk/pspsdk)
+  		Note: This usually gets installed by the PSP toolchain,
+	 	so you don't have to do it manually.
+
+- SDL		(svn co svn://svn.pspdev.org/psp/trunk/SDL)
+
+- zlib		(svn co svn://svn.pspdev.org/psp/trunk/zlib)
+
+- libmad(*)	(svn co svn://svn.pspdev.org/psp/trunk/libmad)
+
+- libTremor(*)	(svn co svn://svn.pspdev.org/psp/trunk/libTremor)
+
+- libmpeg2(*)  	(http://libmpeg2.sf.net)
+		Note: As this is not in pspdev svn, you'll need to build
+		it manually. Adding a psp target/host to config.sub and
+		using a configure line similar to the SDL port worked for
+		me.
+
+(*) = optional
+
+When you've installed these libraries (read their README.PSP for instructions),
+type "make" in the backends/psp directory to build an 1.00 firmware EBOOT.PBP,
+or "make kxploit" to build the 1.50/kxploit EBOOT.PBPs
+
+You can control most of the build process (engines and libraries used) from
+the Makefile.
+
+
+Port Authors
+============
+
+Joost Peters   (joostp at scummvm.org)
+Paolo Costabel (paoloc at pacbell.net)
+Thomas Mayer   (tommybear at internode.on.net)
+





More information about the Scummvm-git-logs mailing list