[Scummvm-cvs-logs] SF.net SVN: scummvm:[53635] scummvm/trunk/backends/platform/psp

[Bluddy at users.sourceforge.net]

Revision: 53635
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53635&view=rev
Author:   Bluddy
Date:     2010-10-20 05:59:11 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
PSP: added dummy function to allow BS2.5 to build

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/Makefile
    scummvm/trunk/backends/platform/psp/module.mk
    scummvm/trunk/backends/platform/psp/psp.spec

Added Paths:
-----------
    scummvm/trunk/backends/platform/psp/dummy.cpp

Modified: scummvm/trunk/backends/platform/psp/Makefile
===================================================================
--- scummvm/trunk/backends/platform/psp/Makefile	2010-10-20 04:20:11 UTC (rev 53634)
+++ scummvm/trunk/backends/platform/psp/Makefile	2010-10-20 05:59:11 UTC (rev 53635)
@@ -126,7 +126,7 @@
 # PSP LIBS
 PSPLIBS =  -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
 	-lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lpspaudiocodec \
-	-lpspkernel
+	-lpspkernel -lpspnet_inet
 
 # Add in PSPSDK includes and libraries.
 LIBS     += -lpng -lz -lstdc++ -lc -lm $(PSPLIBS)
@@ -150,7 +150,8 @@
 	mp3.o \
 	png_loader.o \
 	image_viewer.o \
-	tests.o
+	tests.o \
+	dummy.o
 
 BACKEND := psp
 

Added: scummvm/trunk/backends/platform/psp/dummy.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/dummy.cpp	                        (rev 0)
+++ scummvm/trunk/backends/platform/psp/dummy.cpp	2010-10-20 05:59:11 UTC (rev 53635)
@@ -0,0 +1,59 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/psp/osys_psp.cpp $
+ * $Id: osys_psp.cpp 46126 2009-11-24 14:18:46Z fingolfin $
+ *
+ */
+
+ //#include "common/scummsys.h"
+ #include <time.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <png.h>
+ #include <sys/socket.h>
+ 
+//void userWriteFn(png_structp png_ptr, png_bytep data, png_size_t length) {
+//}
+
+//void userFlushFn(png_structp png_ptr) {
+//}
+ 
+ // Dummy functions are pulled in so that we don't need to build the plugins with certain libs
+ 
+ int dummyFunc() {
+
+	// For Broken Sword 2.5
+ 	volatile int i;
+	i = clock();
+	rename("dummyA", "dummyB");
+	
+	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+	png_set_write_fn(png_ptr, NULL, NULL, NULL);
+	png_infop info_ptr;
+	png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+	png_destroy_write_struct(&png_ptr, &info_ptr);
+	
+	// For lua's usage of libc: very heavy usage so it pulls in sockets?
+	setsockopt(0, 0, 0, NULL, 0);
+	getsockopt(0, 0, 0, NULL, NULL);
+	
+	return i;
+}
\ No newline at end of file


Property changes on: scummvm/trunk/backends/platform/psp/dummy.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: scummvm/trunk/backends/platform/psp/module.mk
===================================================================
--- scummvm/trunk/backends/platform/psp/module.mk	2010-10-20 04:20:11 UTC (rev 53634)
+++ scummvm/trunk/backends/platform/psp/module.mk	2010-10-20 05:59:11 UTC (rev 53635)
@@ -19,7 +19,8 @@
 	mp3.o \
 	png_loader.o \
 	image_viewer.o \
-	tests.o
+	tests.o \
+	dummy.o
 
 # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS.
 MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS))

Modified: scummvm/trunk/backends/platform/psp/psp.spec
===================================================================
--- scummvm/trunk/backends/platform/psp/psp.spec	2010-10-20 04:20:11 UTC (rev 53634)
+++ scummvm/trunk/backends/platform/psp/psp.spec	2010-10-20 05:59:11 UTC (rev 53635)
@@ -1,3 +1,3 @@
 %rename lib	old_lib
 *lib:
-%(old_lib) -lz -lstdc++ -lc -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel
+%(old_lib) -lz -lstdc++ -lc -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel -lpspnet_inet


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